You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by mu...@apache.org on 2007/08/23 19:25:38 UTC
svn commit: r569078 - in
/xml/security/branches/stax_jsr105/src/com/r_bg/stax:
StaxSignatureValidator.java StaxValidateContext.java StaxWatcher.java
XMLSignatureWorker.java
Author: mullan
Date: Thu Aug 23 10:25:37 2007
New Revision: 569078
URL: http://svn.apache.org/viewvc?rev=569078&view=rev
Log:
Change name of StaxSignatureVerificator to StaxSignatureValidator.
Added:
xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxSignatureValidator.java
- copied, changed from r569076, xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxSignatureVerificator.java
Modified:
xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxValidateContext.java
xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxWatcher.java
xml/security/branches/stax_jsr105/src/com/r_bg/stax/XMLSignatureWorker.java
Copied: xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxSignatureValidator.java (from r569076, xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxSignatureVerificator.java)
URL: http://svn.apache.org/viewvc/xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxSignatureValidator.java?p2=xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxSignatureValidator.java&p1=xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxSignatureVerificator.java&r1=569076&r2=569078&rev=569078&view=diff
==============================================================================
--- xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxSignatureVerificator.java (original)
+++ xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxSignatureValidator.java Thu Aug 23 10:25:37 2007
@@ -17,7 +17,7 @@
this.re=reader;
this.os=os;
}
- public StaxWorker watch(XMLStreamReader reader, StaxSignatureVerificator sig) {
+ public StaxWorker watch(XMLStreamReader reader, StaxSignatureValidator sig) {
if (uri.equals(reader.getAttributeValue(null, "Id"))) {
return new C14nWorker(re,os);
}
@@ -26,13 +26,13 @@
}
-public class StaxSignatureVerificator implements StreamFilter{
+public class StaxSignatureValidator implements StreamFilter{
List<XMLSignatureWorker> signatures=new ArrayList<XMLSignatureWorker>();
List<StaxWorker> filters=new ArrayList<StaxWorker>();
List<Integer> filterStart=new ArrayList<Integer>();
List<StaxWatcher> watchers=new ArrayList<StaxWatcher>();
int level=0;
- public StaxSignatureVerificator() {
+ public StaxSignatureValidator() {
watchers.add(new SignatureWatcher());
}
public void addSignature(XMLSignatureWorker s) {
Modified: xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxValidateContext.java
URL: http://svn.apache.org/viewvc/xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxValidateContext.java?rev=569078&r1=569077&r2=569078&view=diff
==============================================================================
--- xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxValidateContext.java (original)
+++ xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxValidateContext.java Thu Aug 23 10:25:37 2007
@@ -12,7 +12,7 @@
public class StaxValidateContext implements XMLValidateContext {
private XMLStreamReader reader;
private int signatureNumber = 0;
- private StaxSignatureVerificator sig;
+ private StaxSignatureValidator sig;
private KeySelector ks;
private HashMap nsMap = new HashMap();
private HashMap objMap = new HashMap();
@@ -34,7 +34,7 @@
}
setKeySelector(KeySelector.singletonKeySelector(key));
this.reader = reader;
- sig = new StaxSignatureVerificator();
+ sig = new StaxSignatureValidator();
}
public StaxValidateContext(KeySelector ks, XMLStreamReader reader) {
@@ -43,7 +43,7 @@
}
this.ks = ks;
this.reader = reader;
- sig = new StaxSignatureVerificator();
+ sig = new StaxSignatureValidator();
}
public String getBaseURI() {
Modified: xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxWatcher.java
URL: http://svn.apache.org/viewvc/xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxWatcher.java?rev=569078&r1=569077&r2=569078&view=diff
==============================================================================
--- xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxWatcher.java (original)
+++ xml/security/branches/stax_jsr105/src/com/r_bg/stax/StaxWatcher.java Thu Aug 23 10:25:37 2007
@@ -9,5 +9,5 @@
* @return a StreamFilter to be notified for the life of the element and all
* subelements.
*/
- public StaxWorker watch(XMLStreamReader reader, StaxSignatureVerificator sig);
+ public StaxWorker watch(XMLStreamReader reader, StaxSignatureValidator sig);
}
Modified: xml/security/branches/stax_jsr105/src/com/r_bg/stax/XMLSignatureWorker.java
URL: http://svn.apache.org/viewvc/xml/security/branches/stax_jsr105/src/com/r_bg/stax/XMLSignatureWorker.java?rev=569078&r1=569077&r2=569078&view=diff
==============================================================================
--- xml/security/branches/stax_jsr105/src/com/r_bg/stax/XMLSignatureWorker.java (original)
+++ xml/security/branches/stax_jsr105/src/com/r_bg/stax/XMLSignatureWorker.java Thu Aug 23 10:25:37 2007
@@ -302,7 +302,7 @@
}
class SignatureWatcher implements StaxWatcher {
- public StaxWorker watch(XMLStreamReader reader, StaxSignatureVerificator sig) {
+ public StaxWorker watch(XMLStreamReader reader, StaxSignatureValidator sig) {
String name=reader.getLocalName();
String uri=reader.getNamespaceURI();
if (name.equals("Signature") &&