Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java Mon Oct 5 10:30:28 2015 @@ -18,15 +18,30 @@ */ package org.apache.wss4j.stax.test; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.ext.SecurePart; @@ -37,21 +52,6 @@ import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - public class HeaderOrderingTest extends AbstractTestBase { @Test
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java Mon Oct 5 10:30:28 2015 @@ -18,42 +18,54 @@ */ package org.apache.wss4j.stax.test; +import java.security.KeyStore; +import java.security.cert.Certificate; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; + +import javax.xml.namespace.QName; + import org.apache.wss4j.common.crypto.WSProviderConfig; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.saml.SAMLCallback; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.bean.SubjectBean; import org.apache.wss4j.common.saml.bean.Version; -import org.apache.wss4j.stax.WSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.impl.InboundWSSecurityContextImpl; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.apache.wss4j.stax.impl.securityToken.HttpsSecurityTokenImpl; import org.apache.wss4j.stax.impl.securityToken.SamlSecurityTokenImpl; import org.apache.wss4j.stax.impl.securityToken.UsernameSecurityTokenImpl; import org.apache.wss4j.stax.impl.securityToken.X509SecurityTokenImpl; -import org.apache.wss4j.stax.securityEvent.*; +import org.apache.wss4j.stax.securityEvent.EncryptedPartSecurityEvent; +import org.apache.wss4j.stax.securityEvent.HttpsTokenSecurityEvent; +import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; +import org.apache.wss4j.stax.securityEvent.RequiredElementSecurityEvent; +import org.apache.wss4j.stax.securityEvent.SamlTokenSecurityEvent; +import org.apache.wss4j.stax.securityEvent.SignatureConfirmationSecurityEvent; +import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent; +import org.apache.wss4j.stax.securityEvent.TimestampSecurityEvent; +import org.apache.wss4j.stax.securityEvent.UsernameTokenSecurityEvent; import org.apache.wss4j.stax.securityEvent.X509TokenSecurityEvent; +import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.config.Init; import org.apache.xml.security.stax.ext.XMLSecurityConstants; 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.util.IDGenerator; -import org.apache.xml.security.stax.securityEvent.*; +import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent; +import org.apache.xml.security.stax.securityEvent.SecurityEvent; +import org.apache.xml.security.stax.securityEvent.SecurityEventListener; +import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent; +import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import javax.xml.namespace.QName; - -import java.security.KeyStore; -import java.security.cert.Certificate; -import java.security.cert.X509Certificate; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; - public class InboundWSSecurityContextImplTest { @BeforeClass Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java Mon Oct 5 10:30:28 2015 @@ -18,34 +18,57 @@ */ package org.apache.wss4j.stax.test; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; + import org.apache.wss4j.common.bsp.BSPRule; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.*; +import org.apache.wss4j.stax.ext.WSSConstants; +import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityEvent.EncryptedPartSecurityEvent; import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent; import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.ext.SecurePart; -import org.apache.xml.security.stax.securityEvent.*; +import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent; +import org.apache.xml.security.stax.securityEvent.SecurityEvent; +import org.apache.xml.security.stax.securityEvent.SecurityEventListener; +import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent; +import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent; import org.junit.Assert; import org.junit.Test; -import org.w3c.dom.*; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpression; - -import java.io.*; -import java.util.*; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; public class InteroperabilityTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java Mon Oct 5 10:30:28 2015 @@ -27,10 +27,10 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityEvent.SecurityEvent; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java Mon Oct 5 10:30:28 2015 @@ -19,26 +19,26 @@ package org.apache.wss4j.stax.test; -import org.apache.xml.security.stax.securityEvent.SecurityEvent; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; + import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; +import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.junit.Assert; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.util.ArrayList; -import java.util.List; - public class OutputChainTest extends AbstractTestBase { @Test Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java Mon Oct 5 10:30:28 2015 @@ -34,10 +34,10 @@ import org.apache.wss4j.common.crypto.Cr import org.apache.wss4j.common.crypto.JasyptPasswordEncryptor; import org.apache.wss4j.common.crypto.PasswordEncryptor; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.junit.Assert; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordTypeTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordTypeTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordTypeTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordTypeTest.java Mon Oct 5 10:30:28 2015 @@ -31,10 +31,10 @@ import javax.xml.transform.stream.Stream import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.junit.Assert; import org.junit.Test; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java Mon Oct 5 10:30:28 2015 @@ -35,13 +35,13 @@ import org.apache.wss4j.stax.securityTok import org.apache.wss4j.stax.securityToken.SamlSecurityToken; import org.apache.wss4j.stax.securityToken.UsernameSecurityToken; import org.apache.wss4j.stax.securityToken.X509SecurityToken; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.securityEvent.*; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.test.saml.SAML1CallbackHandler; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java Mon Oct 5 10:30:28 2015 @@ -33,10 +33,10 @@ import org.apache.wss4j.common.saml.bean import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.saml.SAML2CallbackHandler; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.validate.SamlTokenValidatorImpl; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java Mon Oct 5 10:30:28 2015 @@ -18,29 +18,48 @@ */ package org.apache.wss4j.stax.test; -import org.apache.wss4j.dom.WSConstants; -import org.apache.wss4j.dom.WSSConfig; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Properties; + +import javax.xml.crypto.dsig.SignatureMethod; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.apache.wss4j.common.bsp.BSPRule; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.derivedKey.ConversationConstants; +import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.dom.WSSConfig; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.dom.message.*; +import org.apache.wss4j.dom.message.WSSecDKEncrypt; +import org.apache.wss4j.dom.message.WSSecDKSign; +import org.apache.wss4j.dom.message.WSSecHeader; +import org.apache.wss4j.dom.message.WSSecSecurityContextToken; +import org.apache.wss4j.dom.message.WSSecSignature; import org.apache.wss4j.dom.util.WSSecurityUtil; +import org.apache.wss4j.stax.ext.WSSConstants; +import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityEvent.EncryptedPartSecurityEvent; import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent; -import org.apache.xml.security.stax.securityEvent.SecurityEvent; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; -import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.SOAPUtil; import org.apache.wss4j.stax.test.utils.SecretKeyCallbackHandler; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; +import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent; import org.junit.Assert; import org.junit.BeforeClass; @@ -50,21 +69,6 @@ import org.junit.runners.Parameterized.P import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import javax.xml.crypto.dsig.SignatureMethod; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Properties; - @RunWith(value = org.junit.runners.Parameterized.class) public class SecurityContextTokenTest extends AbstractTestBase { Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java Mon Oct 5 10:30:28 2015 @@ -34,10 +34,10 @@ import javax.xml.transform.stream.Stream import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.junit.Assert; import org.junit.Test; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java Mon Oct 5 10:30:28 2015 @@ -36,10 +36,10 @@ import javax.xml.transform.stream.Stream import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.handler.RequestData; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.junit.Assert; import org.junit.Test; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java Mon Oct 5 10:30:28 2015 @@ -18,11 +18,29 @@ */ package org.apache.wss4j.stax.test; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.handler.WSHandlerResult; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.*; +import org.apache.wss4j.stax.ext.WSSConstants; +import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.ext.SecurePart; @@ -34,21 +52,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - public class SignatureConfirmationTest extends AbstractTestBase { @SuppressWarnings("unchecked") Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java Mon Oct 5 10:30:28 2015 @@ -42,11 +42,11 @@ import org.apache.wss4j.dom.handler.WSHa import org.apache.wss4j.dom.message.WSSecEncrypt; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSignature; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.config.JCEAlgorithmMapper; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java Mon Oct 5 10:30:28 2015 @@ -52,16 +52,16 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSignature; -import org.apache.wss4j.stax.ConfigurationConverter; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent; import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.setup.ConfigurationConverter; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.exceptions.XMLSecurityException; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java Mon Oct 5 10:30:28 2015 @@ -18,16 +18,38 @@ */ package org.apache.wss4j.stax.test; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.bsp.BSPRule; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.xml.security.stax.securityEvent.SecurityEvent; -import org.apache.wss4j.stax.ConfigurationConverter; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.*; +import org.apache.wss4j.stax.ext.WSSConstants; +import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.ConfigurationConverter; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; +import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.junit.Assert; import org.junit.Test; import org.w3c.dom.Document; @@ -35,19 +57,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.util.*; - public class TimestampTest extends AbstractTestBase { @Test Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java Mon Oct 5 10:30:28 2015 @@ -40,14 +40,14 @@ import org.apache.wss4j.common.Configura import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.ConfigurationConverter; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityEvent.UsernameTokenSecurityEvent; import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.stax.setup.ConfigurationConverter; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.stax.securityEvent.SecurityEvent; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java Mon Oct 5 10:30:28 2015 @@ -18,15 +18,32 @@ */ package org.apache.wss4j.stax.test; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; + import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream; import org.apache.wss4j.common.bsp.BSPRule; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.xml.security.stax.config.Init; import org.apache.xml.security.stax.config.TransformerAlgorithmMapper; @@ -37,20 +54,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpression; - -import java.io.*; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Properties; - public class VulnerabliltyVectorsTest extends AbstractTestBase { /** Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java Mon Oct 5 10:30:28 2015 @@ -44,9 +44,9 @@ import org.apache.wss4j.dom.message.Atta import org.apache.wss4j.dom.message.WSSecEncrypt; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.util.WSSecurityUtil; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.junit.Assert; import org.w3c.dom.Document; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java Mon Oct 5 10:30:28 2015 @@ -45,15 +45,15 @@ import org.apache.wss4j.common.saml.buil import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSAMLToken; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.impl.securityToken.HttpsSecurityTokenImpl; import org.apache.wss4j.stax.securityEvent.HttpsTokenSecurityEvent; import org.apache.wss4j.stax.securityToken.HttpsSecurityToken; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.CallbackHandlerImpl; import org.apache.wss4j.stax.test.utils.SOAPUtil; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java Mon Oct 5 10:30:28 2015 @@ -18,14 +18,24 @@ */ package org.apache.wss4j.stax.test.saml; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.util.Properties; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.junit.Assert; @@ -34,16 +44,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.util.Properties; - public class SAMLTokenNegativeTest extends AbstractTestBase { @Test Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java Mon Oct 5 10:30:28 2015 @@ -18,14 +18,27 @@ */ package org.apache.wss4j.stax.test.saml; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.security.KeyStore; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; import org.apache.wss4j.common.crypto.Merlin; -import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.SAMLCallback; import org.apache.wss4j.common.saml.SAMLUtil; +import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.bean.Version; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; @@ -34,13 +47,13 @@ import org.apache.wss4j.dom.handler.WSHa import org.apache.wss4j.dom.message.WSSecEncrypt; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.saml.WSSecSignatureSAML; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.CallbackHandlerImpl; import org.apache.wss4j.stax.test.utils.SOAPUtil; @@ -54,19 +67,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.security.KeyStore; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - public class SAMLTokenReferenceTest extends AbstractTestBase { @Test Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java Mon Oct 5 10:30:28 2015 @@ -18,21 +18,37 @@ */ package org.apache.wss4j.stax.test.saml; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.apache.wss4j.common.crypto.CryptoType; import org.apache.wss4j.common.saml.bean.Version; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.*; -import org.apache.wss4j.stax.securityToken.HttpsSecurityToken; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.ext.WSSConstants; +import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.impl.securityToken.HttpsSecurityTokenImpl; import org.apache.wss4j.stax.securityEvent.HttpsTokenSecurityEvent; +import org.apache.wss4j.stax.securityToken.HttpsSecurityToken; +import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.CallbackHandlerImpl; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.stax.securityEvent.SecurityEvent; import org.junit.Assert; import org.junit.Test; @@ -40,18 +56,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - public class SAMLTokenSVTest extends AbstractTestBase { @Test Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java Mon Oct 5 10:30:28 2015 @@ -18,6 +18,25 @@ */ package org.apache.wss4j.stax.test.saml; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.security.Key; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.apache.wss4j.common.ConfigurationConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; @@ -34,12 +53,12 @@ import org.apache.wss4j.dom.common.Keyst import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.message.WSSecSAMLToken; -import org.apache.wss4j.stax.ConfigurationConverter; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.ConfigurationConverter; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.utils.SOAPUtil; import org.apache.wss4j.stax.test.utils.StAX2DOM; @@ -64,25 +83,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import javax.crypto.KeyGenerator; -import javax.crypto.SecretKey; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.security.Key; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - public class SAMLTokenTest extends AbstractTestBase { @Test Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java Mon Oct 5 10:30:28 2015 @@ -32,10 +32,10 @@ import javax.xml.transform.stream.Stream import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.joda.time.DateTime; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java Mon Oct 5 10:30:28 2015 @@ -37,11 +37,11 @@ import org.apache.wss4j.common.saml.bean import org.apache.wss4j.common.saml.bean.ProxyRestrictionBean; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.CallbackHandlerImpl; import org.apache.wss4j.stax.test.utils.StAX2DOM; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java Mon Oct 5 10:30:28 2015 @@ -18,14 +18,22 @@ */ package org.apache.wss4j.stax.test.saml; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.security.cert.X509Certificate; + +import javax.xml.stream.XMLStreamReader; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.SAMLCallback; import org.apache.wss4j.common.saml.SAMLUtil; +import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.token.SecurityTokenReference; import org.apache.wss4j.dom.WSConstants; @@ -33,11 +41,11 @@ import org.apache.wss4j.dom.WSSConfig; import org.apache.wss4j.dom.message.WSSecDKSign; import org.apache.wss4j.dom.message.WSSecHeader; import org.apache.wss4j.dom.util.WSSecurityUtil; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.AbstractTestBase; import org.apache.wss4j.stax.test.CallbackHandlerImpl; import org.apache.wss4j.stax.test.utils.SOAPUtil; @@ -48,14 +56,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import javax.xml.stream.XMLStreamReader; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.security.cert.X509Certificate; - public class SamlTokenDerivedTest extends AbstractTestBase { /**
