This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch coheigea/saml-refactor-new
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/coheigea/saml-refactor-new by
this push:
new 18078dd2e Renaming test saml module
18078dd2e is described below
commit 18078dd2e5228ebcf7446c2996feb9eb64d7d9c4
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Thu Jul 10 10:48:04 2025 +0100
Renaming test saml module
---
.../apache/wss4j/dom/saml/{dom => }/AbstractSAMLCallbackHandler.java | 3 +--
.../test/java/org/apache/wss4j/dom/saml/{dom => }/CustomHandler.java | 2 +-
.../wss4j/dom/saml/{dom => }/CustomSamlAssertionValidator.java | 3 +--
.../org/apache/wss4j/dom/saml/{dom => }/ModifiedRequestTest.java | 5 +----
.../test/java/org/apache/wss4j/dom/saml/{dom => }/PrincipalTest.java | 5 +----
.../test/java/org/apache/wss4j/dom/saml/{dom => }/ReplayTest.java | 5 +----
.../org/apache/wss4j/dom/saml/{dom => }/SAML1AuthnHOKHandler.java | 3 +--
.../org/apache/wss4j/dom/saml/{dom => }/SAML1CallbackHandler.java | 3 +--
.../org/apache/wss4j/dom/saml/{dom => }/SAML2CallbackHandler.java | 3 +--
.../apache/wss4j/dom/saml/{dom => }/SAMLElementCallbackHandler.java | 5 +----
.../org/apache/wss4j/dom/saml/{dom => }/SamlAlgorithmSuiteTest.java | 5 +----
.../test/java/org/apache/wss4j/dom/saml/{dom => }/SamlAuthnTest.java | 5 +----
.../java/org/apache/wss4j/dom/saml/{dom => }/SamlConditionsTest.java | 5 +----
.../java/org/apache/wss4j/dom/saml/{dom => }/SamlNegativeTest.java | 5 +----
.../java/org/apache/wss4j/dom/saml/{dom => }/SamlReferenceTest.java | 5 +----
.../org/apache/wss4j/dom/saml/{dom => }/SamlTokenActionTest.java | 3 +--
.../wss4j/dom/saml/{dom => }/SamlTokenCustomSignatureTest.java | 5 +----
.../org/apache/wss4j/dom/saml/{dom => }/SamlTokenDerivedTest.java | 5 +----
.../java/org/apache/wss4j/dom/saml/{dom => }/SamlTokenHOKTest.java | 5 +----
.../java/org/apache/wss4j/dom/saml/{dom => }/SamlTokenSVTest.java | 5 +----
.../test/java/org/apache/wss4j/dom/saml/{dom => }/SamlTokenTest.java | 5 +----
.../apache/wss4j/dom/saml/{dom => }/SignatureConfirmationTest.java | 2 +-
.../java/org/apache/wss4j/dom/saml/{dom => }/SignaturePartsTest.java | 5 +----
.../org/apache/wss4j/dom/saml/{dom => }/SignedSamlTokenHOKTest.java | 5 +----
.../test/java/org/apache/wss4j/dom/saml/{dom => }/ValidatorTest.java | 5 +----
.../apache/wss4j/dom/saml/{dom => }/ext/AssertionSigningTest.java | 4 ++--
.../java/org/apache/wss4j/stax/test/saml/SAML1CallbackHandler.java | 2 +-
.../java/org/apache/wss4j/stax/test/saml/SAML2CallbackHandler.java | 2 +-
28 files changed, 29 insertions(+), 86 deletions(-)
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/AbstractSAMLCallbackHandler.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/AbstractSAMLCallbackHandler.java
similarity index 99%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/AbstractSAMLCallbackHandler.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/AbstractSAMLCallbackHandler.java
index 60750519e..98d02061a 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/AbstractSAMLCallbackHandler.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/AbstractSAMLCallbackHandler.java
@@ -17,11 +17,10 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import org.apache.wss4j.api.dom.WSConstants;
import org.apache.wss4j.common.crypto.Crypto;
-import org.apache.wss4j.dom.saml.SAMLCallback;
import org.apache.wss4j.dom.saml.bean.ActionBean;
import org.apache.wss4j.dom.saml.bean.AttributeBean;
import org.apache.wss4j.dom.saml.bean.AttributeStatementBean;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomHandler.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/CustomHandler.java
similarity index 98%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomHandler.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/CustomHandler.java
index 78ed780b2..65270eb4e 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomHandler.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/CustomHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomSamlAssertionValidator.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/CustomSamlAssertionValidator.java
similarity index 97%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomSamlAssertionValidator.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/CustomSamlAssertionValidator.java
index 39300163e..7ceb8da14 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/CustomSamlAssertionValidator.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/CustomSamlAssertionValidator.java
@@ -17,10 +17,9 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.api.dom.RequestData;
import org.apache.wss4j.api.dom.validate.Credential;
import org.apache.wss4j.dom.saml.validate.SamlAssertionValidator;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ModifiedRequestTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ModifiedRequestTest.java
similarity index 96%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ModifiedRequestTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ModifiedRequestTest.java
index dd1502396..85470199c 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ModifiedRequestTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ModifiedRequestTest.java
@@ -17,16 +17,13 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.common.util.XMLUtils;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/PrincipalTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/PrincipalTest.java
similarity index 98%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/PrincipalTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/PrincipalTest.java
index 15674c8e1..11e8472df 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/PrincipalTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/PrincipalTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import java.security.Principal;
import java.security.cert.X509Certificate;
@@ -30,9 +30,6 @@ 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.principal.SAMLTokenPrincipal;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.api.dom.token.BinarySecurity;
import org.apache.wss4j.api.dom.token.X509Security;
import org.apache.wss4j.common.util.SOAPUtil;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ReplayTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ReplayTest.java
similarity index 97%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ReplayTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ReplayTest.java
index 199cc4f68..3bfac4ebc 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ReplayTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ReplayTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import java.nio.file.Path;
@@ -32,9 +32,6 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.api.dom.message.WSSecHeader;
import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.saml.bean.ConditionsBean;
import org.apache.wss4j.dom.saml.builder.SAML2Constants;
import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1AuthnHOKHandler.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAML1AuthnHOKHandler.java
similarity index 97%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1AuthnHOKHandler.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAML1AuthnHOKHandler.java
index e22b2eeba..3ffe611ca 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1AuthnHOKHandler.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAML1AuthnHOKHandler.java
@@ -17,13 +17,12 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
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.dom.saml.SAMLCallback;
import org.apache.wss4j.dom.saml.bean.AuthenticationStatementBean;
import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
import org.apache.wss4j.dom.saml.bean.SubjectBean;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1CallbackHandler.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAML1CallbackHandler.java
similarity index 97%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1CallbackHandler.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAML1CallbackHandler.java
index 0c1898160..d3f83fc49 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML1CallbackHandler.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAML1CallbackHandler.java
@@ -17,12 +17,11 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
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.dom.saml.SAMLCallback;
import org.apache.wss4j.dom.saml.bean.AdviceBean;
import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
import org.apache.wss4j.dom.saml.bean.SubjectBean;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML2CallbackHandler.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAML2CallbackHandler.java
similarity index 98%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML2CallbackHandler.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAML2CallbackHandler.java
index bde9d596d..0aba9f26a 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAML2CallbackHandler.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAML2CallbackHandler.java
@@ -17,12 +17,11 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
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.dom.saml.SAMLCallback;
import org.apache.wss4j.dom.saml.bean.AdviceBean;
import org.apache.wss4j.dom.saml.bean.KeyInfoBean;
import org.apache.wss4j.dom.saml.bean.SubjectBean;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAMLElementCallbackHandler.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAMLElementCallbackHandler.java
similarity index 94%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAMLElementCallbackHandler.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAMLElementCallbackHandler.java
index 38d2fab59..86f62af7d 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SAMLElementCallbackHandler.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SAMLElementCallbackHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import java.io.IOException;
@@ -25,9 +25,6 @@ import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
import org.w3c.dom.Element;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAlgorithmSuiteTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
similarity index 98%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAlgorithmSuiteTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
index 83dec1643..07ea0752a 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAlgorithmSuiteTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
@@ -17,10 +17,9 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import javax.xml.crypto.dsig.CanonicalizationMethod;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -36,8 +35,6 @@ import org.apache.wss4j.api.dom.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.api.dom.message.WSSecHeader;
import org.apache.wss4j.dom.saml.message.WSSecSAMLToken;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.util.WSSecurityUtil;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAuthnTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
similarity index 97%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAuthnTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
index bd1f6adce..38bd3ed33 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlAuthnTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import java.time.Duration;
import java.time.Instant;
@@ -25,9 +25,6 @@ import java.time.Instant;
import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.api.dom.WSConstants;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlConditionsTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
similarity index 99%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlConditionsTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
index a3a5603ff..44383e515 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlConditionsTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import java.time.Duration;
import java.time.Instant;
@@ -28,9 +28,6 @@ import java.util.List;
import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.saml.bean.AudienceRestrictionBean;
import org.apache.wss4j.dom.saml.bean.ConditionsBean;
import org.apache.wss4j.dom.saml.bean.DelegateBean;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlNegativeTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
similarity index 98%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlNegativeTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
index 8b27b4056..51e2d6e21 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlNegativeTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
@@ -17,9 +17,8 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.api.dom.WSConstants;
import org.apache.wss4j.common.crypto.KeystoreCallbackHandler;
@@ -33,8 +32,6 @@ 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.ext.WSSecurityException;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
import org.apache.wss4j.dom.saml.bean.SubjectBean;
import org.apache.wss4j.dom.saml.bean.Version;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlReferenceTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
similarity index 99%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlReferenceTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
index 4af984aa7..1908fbe4b 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlReferenceTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
@@ -17,10 +17,9 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import org.apache.wss4j.api.dom.WSEncryptionPart;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.api.dom.WSConstants;
import org.apache.wss4j.api.dom.WSDataRef;
@@ -34,8 +33,6 @@ import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.Merlin;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
import org.apache.wss4j.dom.saml.builder.SAML2Constants;
import org.apache.wss4j.dom.saml.message.WSSecSignatureSAML;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenActionTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
similarity index 99%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenActionTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
index 5308cffa5..ab73e01ef 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenActionTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import java.util.ArrayList;
import java.util.Collections;
@@ -30,7 +30,6 @@ import org.w3c.dom.Document;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.api.dom.WSConstants;
import org.apache.wss4j.common.crypto.KeystoreCallbackHandler;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenCustomSignatureTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
similarity index 97%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenCustomSignatureTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
index f293aa865..5e60f34b5 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenCustomSignatureTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import java.util.ArrayList;
import java.util.List;
@@ -27,9 +27,6 @@ import java.util.TreeMap;
import org.apache.wss4j.api.dom.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.common.util.XMLUtils;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenDerivedTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
similarity index 97%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenDerivedTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
index 8e8d1d3e3..85a644604 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenDerivedTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import java.security.cert.X509Certificate;
import java.util.List;
@@ -29,9 +29,6 @@ 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.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
import org.apache.wss4j.api.dom.token.SecurityTokenReference;
import org.apache.wss4j.common.util.SOAPUtil;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenHOKTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
similarity index 98%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenHOKTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
index a4dab9921..a784f53ac 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenHOKTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
@@ -17,9 +17,8 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.api.dom.WSConstants;
import org.apache.wss4j.common.crypto.KeystoreCallbackHandler;
@@ -31,8 +30,6 @@ import org.apache.wss4j.api.dom.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
import org.apache.wss4j.dom.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.XMLUtils;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenSVTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
similarity index 98%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenSVTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
index a02d66751..b18d797f8 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenSVTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
@@ -17,9 +17,8 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.api.dom.WSConstants;
import org.apache.wss4j.api.dom.WSDataRef;
@@ -30,8 +29,6 @@ import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.api.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
import org.apache.wss4j.dom.saml.builder.SAML2Constants;
import org.apache.wss4j.dom.saml.message.WSSecSignatureSAML;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
similarity index 99%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
index c4b463137..0270c8d44 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SamlTokenTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -40,9 +40,6 @@ 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.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.saml.bean.NameIDBean;
import org.apache.wss4j.dom.saml.bean.SubjectConfirmationDataBean;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignatureConfirmationTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SignatureConfirmationTest.java
similarity index 99%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignatureConfirmationTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SignatureConfirmationTest.java
index a2f7b2ca9..32438f31e 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignatureConfirmationTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SignatureConfirmationTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import java.util.*;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignaturePartsTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SignaturePartsTest.java
similarity index 97%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignaturePartsTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SignaturePartsTest.java
index fab9a6f01..f06ec3461 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignaturePartsTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SignaturePartsTest.java
@@ -17,10 +17,9 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import org.apache.wss4j.api.dom.WSEncryptionPart;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.api.dom.WSDataRef;
import org.apache.wss4j.api.dom.WSConstants;
@@ -33,8 +32,6 @@ import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.Merlin;
-import org.apache.wss4j.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.common.util.XMLUtils;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignedSamlTokenHOKTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
similarity index 99%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignedSamlTokenHOKTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
index 88ed15739..6741c234d 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/SignedSamlTokenHOKTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
@@ -17,9 +17,8 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.util.SOAPUtil;
import org.apache.wss4j.api.dom.WSConstants;
import org.apache.wss4j.api.dom.WSDataRef;
@@ -35,8 +34,6 @@ 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.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
import org.apache.wss4j.dom.saml.bean.KeyInfoBean.CERT_IDENTIFIER;
import org.apache.wss4j.dom.saml.builder.SAML1Constants;
import org.apache.wss4j.dom.saml.builder.SAML2Constants;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ValidatorTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ValidatorTest.java
similarity index 97%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ValidatorTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ValidatorTest.java
index e3bc845fc..aca21a718 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ValidatorTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ValidatorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom;
+package org.apache.wss4j.dom.saml;
import java.security.cert.X509Certificate;
import java.util.List;
@@ -28,9 +28,6 @@ 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.dom.saml.SAMLCallback;
-import org.apache.wss4j.dom.saml.SAMLUtil;
-import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.api.dom.token.BinarySecurity;
import org.apache.wss4j.api.dom.token.X509Security;
import org.apache.wss4j.common.util.SOAPUtil;
diff --git
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ext/AssertionSigningTest.java
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java
similarity index 98%
rename from
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ext/AssertionSigningTest.java
rename to
ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java
index 28d2b0c3f..223aac24a 100644
---
a/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/dom/ext/AssertionSigningTest.java
+++
b/ws-security-dom-saml/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.wss4j.dom.saml.dom.ext;
+package org.apache.wss4j.dom.saml.ext;
import java.io.InputStream;
import java.security.KeyStore;
@@ -34,7 +34,7 @@ import org.apache.wss4j.dom.saml.SamlAssertionWrapper;
import org.apache.wss4j.dom.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
import org.apache.wss4j.common.util.Loader;
-import org.apache.wss4j.dom.saml.dom.SAML2CallbackHandler;
+import org.apache.wss4j.dom.saml.SAML2CallbackHandler;
import org.apache.wss4j.api.dom.engine.WSSConfig;
diff --git
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML1CallbackHandler.java
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML1CallbackHandler.java
index c6f78a055..75ae8fc51 100755
---
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML1CallbackHandler.java
+++
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML1CallbackHandler.java
@@ -33,7 +33,7 @@ import java.io.IOException;
* A Callback Handler implementation for a SAML 1.1 assertion. By default it
creates an
* authentication assertion using Sender Vouches.
*/
-public class SAML1CallbackHandler extends
org.apache.wss4j.dom.saml.dom.SAML1CallbackHandler {
+public class SAML1CallbackHandler extends
org.apache.wss4j.dom.saml.SAML1CallbackHandler {
private String issuerKeyName;
private String issuerKeyPassword;
diff --git
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML2CallbackHandler.java
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML2CallbackHandler.java
index 4d3aafd97..b005f9f9c 100755
---
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML2CallbackHandler.java
+++
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAML2CallbackHandler.java
@@ -33,7 +33,7 @@ import java.io.IOException;
* A Callback Handler implementation for a SAML 2 assertion. By default it
creates an
* authentication assertion using Sender Vouches.
*/
-public class SAML2CallbackHandler extends
org.apache.wss4j.dom.saml.dom.SAML2CallbackHandler {
+public class SAML2CallbackHandler extends
org.apache.wss4j.dom.saml.SAML2CallbackHandler {
private String issuerKeyName;
private String issuerKeyPassword;
