You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2012/06/28 12:11:31 UTC
svn commit: r1354896 [3/4] - in /santuario/xml-security-java/trunk:
.settings/ src/main/java/org/apache/xml/security/stax/
src/main/java/org/apache/xml/security/stax/config/
src/main/java/org/apache/xml/security/stax/crypto/
src/main/java/org/apache/xm...
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/processor/output/AbstractSignatureOutputProcessor.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/processor/output/AbstractSignatureOutputProcessor.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/processor/output/AbstractSignatureOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java Thu Jun 28 10:11:05 2012
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.processor.output;
+package org.apache.xml.security.stax.impl.processor.output;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.swssf.xmlsec.config.JCEAlgorithmMapper;
-import org.swssf.xmlsec.ext.*;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.impl.SignaturePartDef;
-import org.swssf.xmlsec.impl.util.DigestOutputStream;
+import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
+import org.apache.xml.security.stax.ext.*;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.impl.SignaturePartDef;
+import org.apache.xml.security.stax.impl.util.DigestOutputStream;
import org.xmlsecurity.ns.configuration.AlgorithmType;
import javax.xml.namespace.QName;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/FinalOutputProcessor.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/processor/output/FinalOutputProcessor.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/FinalOutputProcessor.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/FinalOutputProcessor.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/processor/output/FinalOutputProcessor.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/processor/output/FinalOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/FinalOutputProcessor.java Thu Jun 28 10:11:05 2012
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.processor.output;
+package org.apache.xml.security.stax.impl.processor.output;
-import org.swssf.xmlsec.ext.AbstractOutputProcessor;
-import org.swssf.xmlsec.ext.OutputProcessorChain;
-import org.swssf.xmlsec.ext.XMLSecurityConstants;
-import org.swssf.xmlsec.ext.XMLSecurityException;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.impl.XMLSecurityEventWriter;
+import org.apache.xml.security.stax.ext.AbstractOutputProcessor;
+import org.apache.xml.security.stax.ext.OutputProcessorChain;
+import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.ext.XMLSecurityException;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.impl.XMLSecurityEventWriter;
import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLOutputFactory;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactory.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/securityToken/SecurityTokenFactory.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactory.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactory.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/securityToken/SecurityTokenFactory.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/securityToken/SecurityTokenFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactory.java Thu Jun 28 10:11:05 2012
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.securityToken;
+package org.apache.xml.security.stax.impl.securityToken;
-import org.swssf.binding.xmldsig.KeyInfoType;
-import org.swssf.xmlsec.config.ConfigurationProperties;
-import org.swssf.xmlsec.crypto.Crypto;
-import org.swssf.xmlsec.ext.SecurityContext;
-import org.swssf.xmlsec.ext.SecurityToken;
-import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.apache.xml.security.binding.xmldsig.KeyInfoType;
+import org.apache.xml.security.stax.config.ConfigurationProperties;
+import org.apache.xml.security.stax.crypto.Crypto;
+import org.apache.xml.security.stax.ext.SecurityContext;
+import org.apache.xml.security.stax.ext.SecurityToken;
+import org.apache.xml.security.stax.ext.XMLSecurityException;
import javax.security.auth.callback.CallbackHandler;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/securityToken/SecurityTokenFactoryImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/securityToken/SecurityTokenFactoryImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/securityToken/SecurityTokenFactoryImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java Thu Jun 28 10:11:05 2012
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.securityToken;
+package org.apache.xml.security.stax.impl.securityToken;
-import org.swssf.binding.xmldsig.KeyInfoType;
-import org.swssf.xmlsec.crypto.Crypto;
-import org.swssf.xmlsec.ext.SecurityContext;
-import org.swssf.xmlsec.ext.SecurityToken;
-import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.apache.xml.security.binding.xmldsig.KeyInfoType;
+import org.apache.xml.security.stax.crypto.Crypto;
+import org.apache.xml.security.stax.ext.SecurityContext;
+import org.apache.xml.security.stax.ext.SecurityToken;
+import org.apache.xml.security.stax.ext.XMLSecurityException;
import javax.security.auth.callback.CallbackHandler;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecAttributeImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecAttributeImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecAttributeImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecAttributeImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecAttributeImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecAttributeImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecAttributeImpl.java Thu Jun 28 10:11:05 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecAttribute;
-import org.swssf.xmlsec.ext.stax.XMLSecNamespace;
+import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
+import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCharactersImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecCharactersImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCharactersImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCharactersImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecCharactersImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecCharactersImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCharactersImpl.java Thu Jun 28 10:11:05 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecCharacters;
-import org.swssf.xmlsec.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecCharacters;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import javax.xml.stream.XMLStreamConstants;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCommentImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecCommentImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCommentImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCommentImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecCommentImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecCommentImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCommentImpl.java Thu Jun 28 10:11:05 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecComment;
-import org.swssf.xmlsec.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecComment;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import javax.xml.stream.XMLStreamConstants;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecDTDImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecDTDImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecDTDImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecDTDImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecDTDImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecDTDImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecDTDImpl.java Thu Jun 28 10:11:05 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecDTD;
-import org.swssf.xmlsec.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecDTD;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import javax.xml.stream.XMLStreamConstants;
import java.util.Collections;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndDocumentImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEndDocumentImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndDocumentImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndDocumentImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEndDocumentImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEndDocumentImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndDocumentImpl.java Thu Jun 28 10:11:05 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecEndDocument;
+import org.apache.xml.security.stax.ext.stax.XMLSecEndDocument;
import javax.xml.stream.XMLStreamConstants;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndElementImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEndElementImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndElementImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndElementImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEndElementImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEndElementImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndElementImpl.java Thu Jun 28 10:11:05 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecEndElement;
-import org.swssf.xmlsec.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityReferenceImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEntityReferenceImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityReferenceImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityReferenceImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEntityReferenceImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEntityReferenceImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityReferenceImpl.java Thu Jun 28 10:11:05 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecEntityReference;
-import org.swssf.xmlsec.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecEntityReference;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.events.EntityDeclaration;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEventBaseImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEventBaseImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecEventBaseImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java Thu Jun 28 10:11:05 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecCharacters;
-import org.swssf.xmlsec.ext.stax.XMLSecEndElement;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecCharacters;
+import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import javax.xml.namespace.QName;
import javax.xml.stream.Location;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecNamespaceImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecNamespaceImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecNamespaceImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecNamespaceImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecNamespaceImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecNamespaceImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecNamespaceImpl.java Thu Jun 28 10:11:05 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecNamespace;
+import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecProcessingInstructionImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecProcessingInstructionImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecProcessingInstructionImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecProcessingInstructionImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecProcessingInstructionImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecProcessingInstructionImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecProcessingInstructionImpl.java Thu Jun 28 10:11:05 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecProcessingInstruction;
-import org.swssf.xmlsec.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecProcessingInstruction;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import javax.xml.stream.XMLStreamConstants;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecStartDocumentImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecStartDocumentImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecStartDocumentImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java Thu Jun 28 10:11:05 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecStartDocument;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartDocument;
import javax.xml.stream.XMLStreamConstants;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecStartElementImpl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecStartElementImpl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/stax/XMLSecStartElementImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java Thu Jun 28 10:11:05 2012
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.stax;
+package org.apache.xml.security.stax.impl.stax;
-import org.swssf.xmlsec.ext.stax.XMLSecAttribute;
-import org.swssf.xmlsec.ext.stax.XMLSecNamespace;
-import org.swssf.xmlsec.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
+import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer11.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer11.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java Thu Jun 28 10:11:05 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.transformer.canonicalizer;
+package org.apache.xml.security.stax.impl.transformer.canonicalizer;
-import org.swssf.xmlsec.ext.stax.XMLSecAttribute;
-import org.swssf.xmlsec.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import javax.xml.namespace.QName;
import java.util.ArrayList;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11_OmitCommentsTransformer.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer11_OmitCommentsTransformer.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11_OmitCommentsTransformer.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11_OmitCommentsTransformer.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer11_OmitCommentsTransformer.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer11_OmitCommentsTransformer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11_OmitCommentsTransformer.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.transformer.canonicalizer;
+package org.apache.xml.security.stax.impl.transformer.canonicalizer;
/**
* @author $Author$
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11_WithCommentsTransformer.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer11_WithCommentsTransformer.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11_WithCommentsTransformer.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11_WithCommentsTransformer.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer11_WithCommentsTransformer.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer11_WithCommentsTransformer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11_WithCommentsTransformer.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.transformer.canonicalizer;
+package org.apache.xml.security.stax.impl.transformer.canonicalizer;
/**
* @author $Author$
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.transformer.canonicalizer;
+package org.apache.xml.security.stax.impl.transformer.canonicalizer;
/**
* @author $Author$
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java Thu Jun 28 10:11:05 2012
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.transformer.canonicalizer;
+package org.apache.xml.security.stax.impl.transformer.canonicalizer;
-import org.swssf.xmlsec.ext.stax.XMLSecAttribute;
-import org.swssf.xmlsec.ext.stax.XMLSecNamespace;
-import org.swssf.xmlsec.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
+import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import java.util.List;
import java.util.SortedSet;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_ExclOmitCommentsTransformer.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_ExclOmitCommentsTransformer.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_ExclOmitCommentsTransformer.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_ExclOmitCommentsTransformer.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_ExclOmitCommentsTransformer.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_ExclOmitCommentsTransformer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_ExclOmitCommentsTransformer.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.transformer.canonicalizer;
+package org.apache.xml.security.stax.impl.transformer.canonicalizer;
/**
* @author $Author$
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_ExclWithCommentsTransformer.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_ExclWithCommentsTransformer.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_ExclWithCommentsTransformer.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_ExclWithCommentsTransformer.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_ExclWithCommentsTransformer.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_ExclWithCommentsTransformer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_ExclWithCommentsTransformer.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.transformer.canonicalizer;
+package org.apache.xml.security.stax.impl.transformer.canonicalizer;
/**
* @author $Author$
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_OmitCommentsTransformer.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_OmitCommentsTransformer.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_OmitCommentsTransformer.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_OmitCommentsTransformer.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_OmitCommentsTransformer.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_OmitCommentsTransformer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_OmitCommentsTransformer.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.transformer.canonicalizer;
+package org.apache.xml.security.stax.impl.transformer.canonicalizer;
/**
* @author $Author$
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_WithCommentsTransformer.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_WithCommentsTransformer.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_WithCommentsTransformer.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_WithCommentsTransformer.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_WithCommentsTransformer.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/Canonicalizer20010315_WithCommentsTransformer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_WithCommentsTransformer.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.transformer.canonicalizer;
+package org.apache.xml.security.stax.impl.transformer.canonicalizer;
/**
* @author $Author$
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/CanonicalizerBase.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/CanonicalizerBase.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java Thu Jun 28 10:11:05 2012
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.transformer.canonicalizer;
+package org.apache.xml.security.stax.impl.transformer.canonicalizer;
import org.apache.xml.security.c14n.implementations.UtfHelpper;
-import org.swssf.xmlsec.ext.Transformer;
-import org.swssf.xmlsec.ext.XMLSecurityException;
-import org.swssf.xmlsec.ext.XMLSecurityUtils;
-import org.swssf.xmlsec.ext.stax.*;
+import org.apache.xml.security.stax.ext.Transformer;
+import org.apache.xml.security.stax.ext.XMLSecurityException;
+import org.apache.xml.security.stax.ext.XMLSecurityUtils;
+import org.apache.xml.security.stax.ext.stax.*;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/ConcreteLSInput.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/ConcreteLSInput.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/ConcreteLSInput.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/ConcreteLSInput.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/ConcreteLSInput.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/ConcreteLSInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/ConcreteLSInput.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.util;
+package org.apache.xml.security.stax.impl.util;
import org.w3c.dom.ls.LSInput;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/DigestOutputStream.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/DigestOutputStream.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/DigestOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.util;
+package org.apache.xml.security.stax.impl.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/IDGenerator.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/IDGenerator.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/IDGenerator.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/IDGenerator.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/IDGenerator.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/IDGenerator.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/IDGenerator.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.util;
+package org.apache.xml.security.stax.impl.util;
import java.util.UUID;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/IVSplittingOutputStream.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/IVSplittingOutputStream.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/IVSplittingOutputStream.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/IVSplittingOutputStream.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/IVSplittingOutputStream.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/IVSplittingOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/IVSplittingOutputStream.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.util;
+package org.apache.xml.security.stax.impl.util;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/MultiInputStream.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/MultiInputStream.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/MultiInputStream.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/MultiInputStream.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/MultiInputStream.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/MultiInputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/MultiInputStream.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.util;
+package org.apache.xml.security.stax.impl.util;
import java.io.IOException;
import java.io.InputStream;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/ReplaceableOuputStream.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/ReplaceableOuputStream.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/ReplaceableOuputStream.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/ReplaceableOuputStream.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/ReplaceableOuputStream.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/ReplaceableOuputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/ReplaceableOuputStream.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.util;
+package org.apache.xml.security.stax.impl.util;
import java.io.FilterOutputStream;
import java.io.IOException;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/SignerOutputStream.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/SignerOutputStream.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/SignerOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java Thu Jun 28 10:11:05 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.util;
+package org.apache.xml.security.stax.impl.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.swssf.xmlsec.ext.XMLSecurityException;
-import org.swssf.xmlsec.impl.algorithms.SignatureAlgorithm;
+import org.apache.xml.security.stax.ext.XMLSecurityException;
+import org.apache.xml.security.stax.impl.algorithms.SignatureAlgorithm;
import java.io.OutputStream;
Copied: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/TrimmerOutputStream.java (from r1354606, santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/TrimmerOutputStream.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/TrimmerOutputStream.java?p2=santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/TrimmerOutputStream.java&p1=santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/TrimmerOutputStream.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/TrimmerOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/TrimmerOutputStream.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.impl.util;
+package org.apache.xml.security.stax.impl.util;
import java.io.FilterOutputStream;
import java.io.IOException;
Modified: santuario/xml-security-java/trunk/src/main/resources/bindings/c14n.xjb
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/c14n.xjb?rev=1354896&r1=1354895&r2=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/resources/bindings/c14n.xjb (original)
+++ santuario/xml-security-java/trunk/src/main/resources/bindings/c14n.xjb Thu Jun 28 10:11:05 2012
@@ -4,7 +4,7 @@
version="2.1">
<bindings schemaLocation="schemas/exc-c14n.xsd" version="1.0">
<schemaBindings>
- <package name="org.swssf.binding.excc14n"/>
+ <package name="org.apache.xml.security.binding.excc14n"/>
</schemaBindings>
</bindings>
</bindings>
Modified: santuario/xml-security-java/trunk/src/main/resources/bindings/dsig.xjb
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/dsig.xjb?rev=1354896&r1=1354895&r2=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/resources/bindings/dsig.xjb (original)
+++ santuario/xml-security-java/trunk/src/main/resources/bindings/dsig.xjb Thu Jun 28 10:11:05 2012
@@ -4,7 +4,7 @@
version="2.1">
<bindings schemaLocation="schemas/xmldsig-core-schema.xsd" version="1.0">
<schemaBindings>
- <package name="org.swssf.binding.xmldsig"/>
+ <package name="org.apache.xml.security.binding.xmldsig"/>
</schemaBindings>
</bindings>
</bindings>
Modified: santuario/xml-security-java/trunk/src/main/resources/bindings/dsig11.xjb
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/dsig11.xjb?rev=1354896&r1=1354895&r2=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/resources/bindings/dsig11.xjb (original)
+++ santuario/xml-security-java/trunk/src/main/resources/bindings/dsig11.xjb Thu Jun 28 10:11:05 2012
@@ -4,7 +4,7 @@
version="2.1">
<bindings schemaLocation="schemas/xmldsig11-schema.xsd" node="/xs:schema" version="1.0">
<schemaBindings>
- <package name="org.swssf.binding.xmldsig11"/>
+ <package name="org.apache.xml.security.binding.xmldsig11"/>
</schemaBindings>
</bindings>
</bindings>
Modified: santuario/xml-security-java/trunk/src/main/resources/bindings/xenc.xjb
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/bindings/xenc.xjb?rev=1354896&r1=1354895&r2=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/resources/bindings/xenc.xjb (original)
+++ santuario/xml-security-java/trunk/src/main/resources/bindings/xenc.xjb Thu Jun 28 10:11:05 2012
@@ -4,7 +4,7 @@
version="2.1">
<bindings schemaLocation="schemas/xenc-schema.xsd" version="1.0">
<schemaBindings>
- <package name="org.swssf.binding.xmlenc"/>
+ <package name="org.apache.xml.security.binding.xmlenc"/>
</schemaBindings>
</bindings>
</bindings>
Modified: santuario/xml-security-java/trunk/src/main/resources/security-config.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/resources/security-config.xml?rev=1354896&r1=1354895&r2=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/resources/security-config.xml (original)
+++ santuario/xml-security-java/trunk/src/main/resources/security-config.xml Thu Jun 28 10:11:05 2012
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<!-- This configuration file is used for configuration of the org.swssf -->
+<!-- This configuration file is used for configuration of the org.apache.xml.security -->
<Configuration target="org.apache.xml.security" xmlns="http://www.xmlsecurity.org/NS/configuration">
<Properties>
- <Property NAME="securityTokenFactory" VAL="org.swssf.xmlsec.impl.securityToken.SecurityTokenFactoryImpl"/>
+ <Property NAME="securityTokenFactory" VAL="org.apache.xml.security.stax.impl.securityToken.SecurityTokenFactoryImpl"/>
<Property NAME="CACertKeyStorePassword" VAL="changeit"/>
<!--<Property NAME="CertProvider" VAL="BC"/>-->
<!--<Property NAME="DefaultX509Alias" VAL="sigEnc"/>-->
@@ -12,22 +12,22 @@
<TransformAlgorithms>
<!-- c14n omitting comments -->
<TransformAlgorithm URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
- JAVACLASS="org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_OmitCommentsTransformer" />
+ JAVACLASS="org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_OmitCommentsTransformer" />
<!-- c14n with comments -->
<TransformAlgorithm URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
- JAVACLASS="org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_WithCommentsTransformer" />
+ JAVACLASS="org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_WithCommentsTransformer" />
<!-- c14n 1.1 omitting comments -->
<TransformAlgorithm URI="http://www.w3.org/2006/12/xml-c14n11"
- JAVACLASS="org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer11_OmitCommentsTransformer" />
+ JAVACLASS="org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer11_OmitCommentsTransformer" />
<!-- c14n 1.1 with comments -->
<TransformAlgorithm URI="http://www.w3.org/2006/12/xml-c14n11#WithComments"
- JAVACLASS="org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer11_WithCommentsTransformer" />
+ JAVACLASS="org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer11_WithCommentsTransformer" />
<!-- exclusive c14n omitting comments -->
<TransformAlgorithm URI="http://www.w3.org/2001/10/xml-exc-c14n#"
- JAVACLASS="org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_ExclOmitCommentsTransformer" />
+ JAVACLASS="org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_ExclOmitCommentsTransformer" />
<!-- exclusive c14n with comments -->
<TransformAlgorithm URI="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
- JAVACLASS="org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_ExclWithCommentsTransformer" />
+ JAVACLASS="org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_ExclWithCommentsTransformer" />
<!-- Base64 -->
<TransformAlgorithm URI="http://www.w3.org/2000/09/xmldsig#base64"
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer11Test.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer11Test.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer11Test.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer11Test.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer11Test.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer11Test.java Thu Jun 28 10:11:05 2012
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Test;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer11_OmitCommentsTransformer;
-import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer11_WithCommentsTransformer;
-import org.swssf.xmlsec.impl.transformer.canonicalizer.CanonicalizerBase;
-import org.swssf.xmlsec.test.utils.XMLSecEventAllocator;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer11_OmitCommentsTransformer;
+import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer11_WithCommentsTransformer;
+import org.apache.xml.security.stax.impl.transformer.canonicalizer.CanonicalizerBase;
+import org.apache.xml.security.stax.test.utils.XMLSecEventAllocator;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventReader;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer20010315ExclusiveTest.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315ExclusiveTest.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer20010315ExclusiveTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer20010315ExclusiveTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315ExclusiveTest.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer20010315ExclusiveTest.java Thu Jun 28 10:11:05 2012
@@ -16,23 +16,32 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Before;
import org.junit.Test;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_ExclOmitCommentsTransformer;
-import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_ExclWithCommentsTransformer;
-import org.swssf.xmlsec.test.utils.XMLSecEventAllocator;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_ExclOmitCommentsTransformer;
+import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_ExclWithCommentsTransformer;
+import org.apache.xml.security.stax.test.utils.XMLSecEventAllocator;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
+import java.io.StringWriter;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -296,6 +305,65 @@ public class Canonicalizer20010315Exclus
assertEquals(new String(baos.toByteArray()), c14nXML);
}
+
+ /**
+ * Method test24Aexcl - a testcase for SANTUARIO-263
+ * "Canonicalizer can't handle dynamical created DOM correctly"
+ * https://issues.apache.org/jira/browse/SANTUARIO-263
+ */
+ @org.junit.Test
+ public void test24Aexcl() throws Exception {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ Document doc = dbf.newDocumentBuilder ().newDocument ();
+ Element local = doc.createElementNS("foo:bar", "dsig:local");
+ Element test = doc.createElementNS("http://example.net", "etsi:test");
+ Element elem2 = doc.createElementNS("http://example.net", "etsi:elem2");
+ Element stuff = doc.createElementNS("foo:bar", "dsig:stuff");
+ elem2.appendChild(stuff);
+ test.appendChild(elem2);
+ local.appendChild(test);
+ doc.appendChild(local);
+
+ TransformerFactory tf = TransformerFactory.newInstance();
+ Transformer t = tf.newTransformer();
+ StringWriter stringWriter = new StringWriter();
+ StreamResult streamResult = new StreamResult(stringWriter);
+ t.transform(new DOMSource(doc), streamResult);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ List<String> inclusiveNamespaces = new ArrayList<String>();
+ Canonicalizer20010315_ExclWithCommentsTransformer c =
+ new Canonicalizer20010315_ExclWithCommentsTransformer();
+ c.setList(inclusiveNamespaces);
+ c.setOutputStream(baos);
+ XMLEventReader xmlSecEventReader = xmlInputFactory.createXMLEventReader(
+ new StringReader(stringWriter.toString())
+ );
+
+ XMLSecEvent xmlSecEvent = null;
+ while (xmlSecEventReader.hasNext()) {
+ xmlSecEvent = (XMLSecEvent) xmlSecEventReader.nextEvent();
+ if (xmlSecEvent.isStartElement() && xmlSecEvent.asStartElement().getName().equals(new QName("http://example.net", "elem2"))) {
+ break;
+ }
+ }
+
+ while (xmlSecEventReader.hasNext()) {
+ c.transform(xmlSecEvent);
+ if (xmlSecEvent.isEndElement() && xmlSecEvent.asEndElement().getName().equals(new QName("http://example.net", "elem2"))) {
+ break;
+ }
+ xmlSecEvent = (XMLSecEvent) xmlSecEventReader.nextEvent();
+ }
+
+ byte[] reference =
+ getBytesFromResource(this.getClass().getClassLoader().getResource(
+ "org/apache/xml/security/c14n/inExcl/example2_4_c14nized.xml"));
+ boolean equals = java.security.MessageDigest.isEqual(reference, baos.toByteArray());
+
+ assertTrue(equals);
+ }
+
/*
private String getAbsolutePath(String path)
{
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer20010315Test.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315Test.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer20010315Test.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer20010315Test.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315Test.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Canonicalizer20010315Test.java Thu Jun 28 10:11:05 2012
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Test;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_OmitCommentsTransformer;
-import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer20010315_WithCommentsTransformer;
-import org.swssf.xmlsec.impl.transformer.canonicalizer.CanonicalizerBase;
-import org.swssf.xmlsec.test.utils.XMLSecEventAllocator;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_OmitCommentsTransformer;
+import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_WithCommentsTransformer;
+import org.apache.xml.security.stax.impl.transformer.canonicalizer.CanonicalizerBase;
+import org.apache.xml.security.stax.test.utils.XMLSecEventAllocator;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventReader;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/IVSplittingOutputStreamTest.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/IVSplittingOutputStreamTest.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/IVSplittingOutputStreamTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/IVSplittingOutputStreamTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/IVSplittingOutputStreamTest.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/IVSplittingOutputStreamTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/IVSplittingOutputStreamTest.java Thu Jun 28 10:11:05 2012
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Assert;
import org.junit.Test;
-import org.swssf.xmlsec.impl.util.IVSplittingOutputStream;
-import org.swssf.xmlsec.impl.util.ReplaceableOuputStream;
+import org.apache.xml.security.stax.impl.util.IVSplittingOutputStream;
+import org.apache.xml.security.stax.impl.util.ReplaceableOuputStream;
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/InputProcessorChainTest.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/InputProcessorChainTest.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/InputProcessorChainTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/InputProcessorChainTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/InputProcessorChainTest.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/InputProcessorChainTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/InputProcessorChainTest.java Thu Jun 28 10:11:05 2012
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Assert;
import org.junit.Test;
-import org.swssf.xmlsec.ext.InputProcessor;
-import org.swssf.xmlsec.ext.InputProcessorChain;
-import org.swssf.xmlsec.ext.XMLSecurityConstants;
-import org.swssf.xmlsec.ext.XMLSecurityException;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.impl.InputProcessorChainImpl;
-import org.swssf.xmlsec.impl.SecurityContextImpl;
+import org.apache.xml.security.stax.ext.InputProcessor;
+import org.apache.xml.security.stax.ext.InputProcessorChain;
+import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.ext.XMLSecurityException;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.impl.InputProcessorChainImpl;
+import org.apache.xml.security.stax.impl.SecurityContextImpl;
import javax.xml.stream.XMLStreamException;
import java.util.HashSet;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/OutputProcessorChainTest.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/OutputProcessorChainTest.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/OutputProcessorChainTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/OutputProcessorChainTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/OutputProcessorChainTest.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/OutputProcessorChainTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/OutputProcessorChainTest.java Thu Jun 28 10:11:05 2012
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Assert;
import org.junit.Test;
-import org.swssf.xmlsec.ext.*;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.impl.OutputProcessorChainImpl;
-import org.swssf.xmlsec.impl.SecurityContextImpl;
+import org.apache.xml.security.stax.ext.*;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.impl.OutputProcessorChainImpl;
+import org.apache.xml.security.stax.impl.SecurityContextImpl;
import javax.xml.stream.XMLStreamException;
import java.util.HashSet;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Santuario191Test.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Santuario191Test.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Santuario191Test.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Santuario191Test.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Santuario191Test.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/Santuario191Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/Santuario191Test.java Thu Jun 28 10:11:05 2012
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Before;
import org.junit.Test;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.impl.transformer.canonicalizer.Canonicalizer11_OmitCommentsTransformer;
-import org.swssf.xmlsec.test.utils.XMLSecEventAllocator;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer11_OmitCommentsTransformer;
+import org.apache.xml.security.stax.test.utils.XMLSecEventAllocator;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventReader;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/TrimmerOutputStreamTest.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/TrimmerOutputStreamTest.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/TrimmerOutputStreamTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/TrimmerOutputStreamTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/TrimmerOutputStreamTest.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/TrimmerOutputStreamTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/TrimmerOutputStreamTest.java Thu Jun 28 10:11:05 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Assert;
import org.junit.Test;
-import org.swssf.xmlsec.impl.util.TrimmerOutputStream;
+import org.apache.xml.security.stax.impl.util.TrimmerOutputStream;
import java.io.ByteArrayOutputStream;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/UncategorizedTest.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/UncategorizedTest.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/UncategorizedTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/UncategorizedTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/UncategorizedTest.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/UncategorizedTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/UncategorizedTest.java Thu Jun 28 10:11:05 2012
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Assert;
import org.junit.Test;
-import org.swssf.xmlsec.config.Init;
-import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.apache.xml.security.stax.config.Init;
+import org.apache.xml.security.stax.ext.XMLSecurityException;
import java.net.URL;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityEventReaderTest.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventReaderTest.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityEventReaderTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityEventReaderTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventReaderTest.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventReaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityEventReaderTest.java Thu Jun 28 10:11:05 2012
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Assert;
import org.junit.Test;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.ext.stax.XMLSecEventFactory;
-import org.swssf.xmlsec.impl.XMLSecurityEventReader;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
+import org.apache.xml.security.stax.impl.XMLSecurityEventReader;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityEventWriterTest.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventWriterTest.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityEventWriterTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityEventWriterTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventWriterTest.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityEventWriterTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityEventWriterTest.java Thu Jun 28 10:11:05 2012
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Test;
import org.custommonkey.xmlunit.XMLAssert;
-import org.swssf.xmlsec.impl.XMLSecurityEventWriter;
+import org.apache.xml.security.stax.impl.XMLSecurityEventWriter;
import javax.xml.stream.*;
import javax.xml.stream.events.XMLEvent;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityStreamReaderTest.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityStreamReaderTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityStreamReaderTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamReaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityStreamReaderTest.java Thu Jun 28 10:11:05 2012
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Assert;
import org.junit.Test;
import org.custommonkey.xmlunit.XMLAssert;
-import org.swssf.xmlsec.ext.*;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.ext.stax.XMLSecEventFactory;
-import org.swssf.xmlsec.impl.DocumentContextImpl;
-import org.swssf.xmlsec.impl.InputProcessorChainImpl;
-import org.swssf.xmlsec.impl.SecurityContextImpl;
-import org.swssf.xmlsec.impl.XMLSecurityStreamReader;
+import org.apache.xml.security.stax.ext.*;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
+import org.apache.xml.security.stax.impl.DocumentContextImpl;
+import org.apache.xml.security.stax.impl.InputProcessorChainImpl;
+import org.apache.xml.security.stax.impl.SecurityContextImpl;
+import org.apache.xml.security.stax.impl.XMLSecurityStreamReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityStreamWriterTest.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamWriterTest.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityStreamWriterTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityStreamWriterTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamWriterTest.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/XMLSecurityStreamWriterTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/XMLSecurityStreamWriterTest.java Thu Jun 28 10:11:05 2012
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.stax.test;
import org.junit.Assert;
import org.junit.Test;
import org.custommonkey.xmlunit.XMLAssert;
-import org.swssf.xmlsec.ext.*;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.impl.OutputProcessorChainImpl;
-import org.swssf.xmlsec.impl.SecurityContextImpl;
-import org.swssf.xmlsec.impl.XMLSecurityStreamWriter;
+import org.apache.xml.security.stax.ext.*;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.impl.OutputProcessorChainImpl;
+import org.apache.xml.security.stax.impl.SecurityContextImpl;
+import org.apache.xml.security.stax.impl.XMLSecurityStreamWriter;
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLEventWriter;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/utils/StAX2DOM.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/utils/StAX2DOM.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/utils/StAX2DOM.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/utils/StAX2DOM.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/utils/StAX2DOM.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/utils/StAX2DOM.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/utils/StAX2DOM.java Thu Jun 28 10:11:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test.utils;
+package org.apache.xml.security.stax.test.utils;
import org.w3c.dom.*;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/utils/XMLSecEventAllocator.java (from r1354606, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/utils/XMLSecEventAllocator.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/utils/XMLSecEventAllocator.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/utils/XMLSecEventAllocator.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/utils/XMLSecEventAllocator.java&r1=1354606&r2=1354896&rev=1354896&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/utils/XMLSecEventAllocator.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/stax/test/utils/XMLSecEventAllocator.java Thu Jun 28 10:11:05 2012
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test.utils;
+package org.apache.xml.security.stax.test.utils;
-import org.swssf.xmlsec.ext.stax.XMLSecEvent;
-import org.swssf.xmlsec.ext.stax.XMLSecEventFactory;
-import org.swssf.xmlsec.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;