You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2006/05/15 12:00:52 UTC
svn commit: r406597 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/deployment/
integration/test/org/apache/axis2/security/
integration/test/org/apache/axis2/security/rahas/ security/
security/interop/org/apache/axis2/security/ se...
Author: ruchithf
Date: Mon May 15 03:00:47 2006
New Revision: 406597
URL: http://svn.apache.org/viewcvs?rev=406597&view=rev
Log:
Moving org.apache.axis2.security.* to org.apache.rampart.*
Added:
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java
- copied, changed from r405669, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/SecurityModule.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllHandler.java
- copied, changed from r405668, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java
- copied, changed from r405668, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java
- copied, changed from r405668, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSSHandlerConstants.java
- copied, changed from r405668, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/
- copied from r405668, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java
- copied, changed from r406595, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java
- copied, changed from r406595, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/
- copied from r406572, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/Axis2Util.java
- copied, changed from r406595, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/HandlerParameterDecoder.java
- copied, changed from r406595, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/MessageOptimizer.java
- copied, changed from r406595, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java
webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/
webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/
- copied from r405682, webservices/axis2/trunk/java/modules/security/test/org/apache/axis2/security/handler/
webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/
- copied from r406595, webservices/axis2/trunk/java/modules/security/test/org/apache/axis2/security/handler/config/
Removed:
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/SecurityModule.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/
webservices/axis2/trunk/java/modules/security/test/org/apache/axis2/security/handler/
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/AddressingMTOMSecurityTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/MTOMOptimizedSecurityTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario1Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2aTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario5Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario6Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario7Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/ScenarioST1Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario1Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario3Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario4Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java
webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java
webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/PWCallback.java
webservices/axis2/trunk/java/modules/security/maven.xml
webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml
webservices/axis2/trunk/java/modules/security/src/META-INF/rahas-module.xml
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/Receiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/STSRequester.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/Sender.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/WSS4JConfig.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/WSS4JConfigBuilder.java
webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/InflowConfigurationTest.java
webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/OutflowConfigurationTest.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java Mon May 15 03:00:47 2006
@@ -61,6 +61,7 @@
module.setModule((Module) moduleClass.newInstance());
}
} catch (Exception e) {
+ e.printStackTrace();
throw new DeploymentException(e.getMessage(), e);
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/AddressingMTOMSecurityTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/AddressingMTOMSecurityTest.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/AddressingMTOMSecurityTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/AddressingMTOMSecurityTest.java Mon May 15 03:00:47 2006
@@ -16,9 +16,10 @@
package org.apache.axis2.security;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
+
public class AddressingMTOMSecurityTest extends InteropTestBase {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java Mon May 15 03:00:47 2006
@@ -16,16 +16,17 @@
package org.apache.axis2.security;
-import junit.framework.TestCase;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
import org.apache.ws.security.WSConstants;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
+
+import junit.framework.TestCase;
public abstract class InteropTestBase extends TestCase {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/MTOMOptimizedSecurityTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/MTOMOptimizedSecurityTest.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/MTOMOptimizedSecurityTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/MTOMOptimizedSecurityTest.java Mon May 15 03:00:47 2006
@@ -16,9 +16,10 @@
package org.apache.axis2.security;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
+
/**
* Testing optimizing the base 64 elements with
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario1Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario1Test.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario1Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario1Test.java Mon May 15 03:00:47 2006
@@ -16,8 +16,9 @@
package org.apache.axis2.security;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
+
/**
* WS-Security interop scenario 1
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2Test.java Mon May 15 03:00:47 2006
@@ -16,9 +16,9 @@
package org.apache.axis2.security;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
import org.apache.ws.security.WSConstants;
/**
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2aTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2aTest.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2aTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario2aTest.java Mon May 15 03:00:47 2006
@@ -16,10 +16,11 @@
package org.apache.axis2.security;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
import org.apache.ws.security.WSConstants;
+
/**
* WS-Security interop scenario 2a
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java Mon May 15 03:00:47 2006
@@ -16,9 +16,9 @@
package org.apache.axis2.security;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
import org.apache.ws.security.WSConstants;
/**
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario4Test.java Mon May 15 03:00:47 2006
@@ -16,9 +16,9 @@
package org.apache.axis2.security;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
import org.apache.ws.security.WSConstants;
/**
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario5Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario5Test.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario5Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario5Test.java Mon May 15 03:00:47 2006
@@ -16,9 +16,9 @@
package org.apache.axis2.security;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
/**
* WS-Security interop scenario 5
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario6Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario6Test.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario6Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario6Test.java Mon May 15 03:00:47 2006
@@ -16,9 +16,9 @@
package org.apache.axis2.security;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
import org.apache.ws.security.WSConstants;
/**
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario7Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario7Test.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario7Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario7Test.java Mon May 15 03:00:47 2006
@@ -17,9 +17,9 @@
package org.apache.axis2.security;
import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
import org.apache.ws.security.WSConstants;
/**
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/ScenarioST1Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/ScenarioST1Test.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/ScenarioST1Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/ScenarioST1Test.java Mon May 15 03:00:47 2006
@@ -16,8 +16,8 @@
package org.apache.axis2.security;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
/**
* SAML Scenario 1
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario1Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario1Test.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario1Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario1Test.java Mon May 15 03:00:47 2006
@@ -17,8 +17,8 @@
package org.apache.axis2.security.rahas;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
/**
* The RequestedProofToken is an EncryptedKey
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario3Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario3Test.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario3Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario3Test.java Mon May 15 03:00:47 2006
@@ -17,8 +17,8 @@
package org.apache.axis2.security.rahas;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
/**
* This tests security context establishment when there's no STS involved.
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario4Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario4Test.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario4Test.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/RahasScenario4Test.java Mon May 15 03:00:47 2006
@@ -17,8 +17,8 @@
package org.apache.axis2.security.rahas;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
/**
* This tests the use computed keys when the requester provides entropy
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java Mon May 15 03:00:47 2006
@@ -29,9 +29,9 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java (original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java Mon May 15 03:00:47 2006
@@ -16,15 +16,19 @@
package org.apache.axis2.security;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.oasis.ping.PingPortStub;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.xmlsoap.ping.*;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
+import org.xmlsoap.ping.Ping;
+import org.xmlsoap.ping.PingDocument;
+import org.xmlsoap.ping.PingResponse;
+import org.xmlsoap.ping.PingResponseDocument;
+import org.xmlsoap.ping.TicketType;
/**
* Client for the interop service
Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/PWCallback.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/PWCallback.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/PWCallback.java (original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/PWCallback.java Mon May 15 03:00:47 2006
@@ -54,6 +54,16 @@
+ /*
+
+ * (non-Javadoc)
+
+ * @see javax.security.auth.callback.CallbackHandler#handle(javax.security.auth.callback.Callback[])
+
+ */
+
+
+
/**
* Method handle
Modified: webservices/axis2/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/maven.xml?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Mon May 15 03:00:47 2006
@@ -27,7 +27,7 @@
<copy todir="target/temp-mar">
<fileset dir="target/classes">
- <include name="**/org/apache/axis2/*/**/*.class"/>
+ <include name="**/org/apache/*/**/*.class"/>
<exclude name="**/org/apache/axis2/security/InteropScenarioClient.class"/>
</fileset>
</copy>
Modified: webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml (original)
+++ webservices/axis2/trunk/java/modules/security/src/META-INF/module.xml Mon May 15 03:00:47 2006
@@ -1,13 +1,13 @@
-<module name="rampart" class="org.apache.axis2.security.SecurityModule">
+<module name="rampart" class="org.apache.rampart.Rampart">
<Description>This module provides the WS-Security functionalities for Axis2, based on Apache WSS4J and Apache XML-Security implementations</Description>
<inflow>
- <handler name="SecurityInHandler" class="org.apache.axis2.security.WSDoAllReceiver">
+ <handler name="SecurityInHandler" class="org.apache.rampart.handler.WSDoAllReceiver">
<order phase="Security" phaseFirst="true"/>
</handler>
</inflow>
<outflow>
- <handler name="SecurityOutHandler" class="org.apache.axis2.security.WSDoAllSender">
+ <handler name="SecurityOutHandler" class="org.apache.rampart.handler.WSDoAllSender">
<order phase="MessageOut"/>
</handler>
</outflow>
Modified: webservices/axis2/trunk/java/modules/security/src/META-INF/rahas-module.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/META-INF/rahas-module.xml?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/META-INF/rahas-module.xml (original)
+++ webservices/axis2/trunk/java/modules/security/src/META-INF/rahas-module.xml Mon May 15 03:00:47 2006
@@ -1,4 +1,4 @@
-<module name="rahas" class="org.apache.axis2.security.SecurityModule">
+<module name="rahas" class="org.apache.rampart.Rampart">
<Description>RAHAS - Implementation of WS-SecureConversation specification</Description>
<inflow>
<handler name="inflowHandler" class="org.apache.axis2.security.rahas.Receiver">
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java Mon May 15 03:00:47 2006
@@ -24,7 +24,7 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.security.trust.SimpleTokenStore;
import org.apache.axis2.security.trust.TokenStorage;
-import org.apache.axis2.security.util.Axis2Util;
+import org.apache.rampart.util.Axis2Util;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.handler.WSHandlerConstants;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/Receiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/Receiver.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/Receiver.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/Receiver.java Mon May 15 03:00:47 2006
@@ -25,9 +25,9 @@
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.Handler;
-import org.apache.axis2.security.WSDoAllReceiver;
import org.apache.axis2.security.trust.Constants;
-import org.apache.axis2.security.util.Axis2Util;
+import org.apache.rampart.handler.WSDoAllReceiver;
+import org.apache.rampart.util.Axis2Util;
import org.apache.ws.security.WSSecurityEngine;
import javax.xml.namespace.QName;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/STSRequester.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/STSRequester.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/STSRequester.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/STSRequester.java Mon May 15 03:00:47 2006
@@ -28,11 +28,11 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.OutInAxisOperation;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.axis2.security.trust.Constants;
import org.apache.axis2.security.trust.TrustUtil;
import org.apache.axis2.security.trust.types.RequestSecurityTokenType;
-import org.apache.axis2.security.util.Axis2Util;
+import org.apache.rampart.util.Axis2Util;
import org.apache.axis2.util.Base64;
import org.apache.axis2.util.StreamWrapper;
import org.apache.ws.security.util.WSSecurityUtil;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/Sender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/Sender.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/Sender.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/Sender.java Mon May 15 03:00:47 2006
@@ -26,7 +26,7 @@
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.Handler;
-import org.apache.axis2.security.WSDoAllSender;
+import org.apache.rampart.handler.WSDoAllSender;
import org.apache.axis2.security.trust.Constants;
import org.apache.axis2.security.trust.Token;
import org.apache.axis2.security.trust.TrustException;
Copied: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java (from r405669, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/SecurityModule.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java?p2=webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java&p1=webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/SecurityModule.java&r1=405669&r2=406597&rev=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/SecurityModule.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java Mon May 15 03:00:47 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security;
+package org.apache.rampart;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
@@ -23,16 +23,16 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.modules.Module;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
-import org.apache.axis2.security.util.HandlerParameterDecoder;
+import org.apache.rampart.util.HandlerParameterDecoder;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
import org.apache.ws.policy.Policy;
import org.apache.ws.security.policy.WSS4JConfig;
import org.apache.ws.security.policy.WSS4JConfigBuilder;
import org.apache.ws.security.policy.parser.WSSPolicyProcessor;
-public class SecurityModule implements Module {
+public class Rampart implements Module {
private AxisModule module;
public void init(ConfigurationContext configContext, AxisModule module)
Copied: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllHandler.java (from r405668, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllHandler.java?p2=webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllHandler.java&p1=webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java&r1=405668&r2=406597&rev=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSDoAllHandler.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllHandler.java Mon May 15 03:00:47 2006
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.apache.axis2.security.handler;
+package org.apache.rampart.handler;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.Handler;
-import org.apache.axis2.security.util.Axis2Util;
+import org.apache.rampart.util.Axis2Util;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandler;
Copied: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java (from r405668, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java?p2=webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java&p1=webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java&r1=405668&r2=406597&rev=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllReceiver.java Mon May 15 03:00:47 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security;
+package org.apache.rampart.handler;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -27,10 +27,8 @@
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.security.handler.WSDoAllHandler;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.util.Axis2Util;
-import org.apache.axis2.security.util.HandlerParameterDecoder;
+import org.apache.rampart.util.Axis2Util;
+import org.apache.rampart.util.HandlerParameterDecoder;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java (from r405668, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java?p2=webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java&p1=webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java&r1=405668&r2=406597&rev=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java Mon May 15 03:00:47 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security;
+package org.apache.rampart.handler;
import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -22,11 +22,9 @@
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.security.handler.WSDoAllHandler;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.util.Axis2Util;
-import org.apache.axis2.security.util.HandlerParameterDecoder;
-import org.apache.axis2.security.util.MessageOptimizer;
+import org.apache.rampart.util.Axis2Util;
+import org.apache.rampart.util.HandlerParameterDecoder;
+import org.apache.rampart.util.MessageOptimizer;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSSHandlerConstants.java (from r405668, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSSHandlerConstants.java?p2=webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSSHandlerConstants.java&p1=webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java&r1=405668&r2=406597&rev=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSSHandlerConstants.java Mon May 15 03:00:47 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security.handler;
+package org.apache.rampart.handler;
/**
* Constants specific to the Axis2 security module
Copied: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java (from r406595, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java?p2=webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java&p1=webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java&r1=406595&r2=406597&rev=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/InflowConfiguration.java Mon May 15 03:00:47 2006
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.apache.axis2.security.handler.config;
+package org.apache.rampart.handler.config;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerConstants;
import java.util.HashMap;
Copied: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java (from r406595, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java?p2=webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java&p1=webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java&r1=406595&r2=406597&rev=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/config/OutflowConfiguration.java Mon May 15 03:00:47 2006
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.apache.axis2.security.handler.config;
+package org.apache.rampart.handler.config;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerConstants;
import java.util.HashMap;
Copied: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/Axis2Util.java (from r406595, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/Axis2Util.java?p2=webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/Axis2Util.java&p1=webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java&r1=406595&r2=406597&rev=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/Axis2Util.java Mon May 15 03:00:47 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security.util;
+package org.apache.rampart.util;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
@@ -31,7 +31,7 @@
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axiom.soap.impl.dom.soap11.SOAP11Factory;
import org.apache.axiom.soap.impl.dom.soap12.SOAP12Factory;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.ws.security.WSSecurityException;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
Copied: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/HandlerParameterDecoder.java (from r406595, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/HandlerParameterDecoder.java?p2=webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/HandlerParameterDecoder.java&p1=webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java&r1=406595&r2=406597&rev=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/HandlerParameterDecoder.java Mon May 15 03:00:47 2006
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.axis2.security.util;
+package org.apache.rampart.util;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.handler.WSHandlerConstants;
Copied: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/MessageOptimizer.java (from r406595, webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/MessageOptimizer.java?p2=webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/MessageOptimizer.java&p1=webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java&r1=406595&r2=406597&rev=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/MessageOptimizer.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/util/MessageOptimizer.java Mon May 15 03:00:47 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.security.util;
+package org.apache.rampart.util;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMText;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/WSS4JConfig.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/WSS4JConfig.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/WSS4JConfig.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/WSS4JConfig.java Mon May 15 03:00:47 2006
@@ -16,8 +16,8 @@
package org.apache.ws.security.policy;
-import org.apache.axis2.security.handler.config.InflowConfiguration;
-import org.apache.axis2.security.handler.config.OutflowConfiguration;
+import org.apache.rampart.handler.config.InflowConfiguration;
+import org.apache.rampart.handler.config.OutflowConfiguration;
import org.apache.ws.security.policy.model.Binding;
import org.apache.ws.security.policy.model.SupportingToken;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/WSS4JConfigBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/WSS4JConfigBuilder.java?rev=406597&r1=406596&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/WSS4JConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/WSS4JConfigBuilder.java Mon May 15 03:00:47 2006
@@ -15,7 +15,7 @@
*/
package org.apache.ws.security.policy;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.policy.model.AsymmetricBinding;
import org.apache.ws.security.policy.model.Binding;
Modified: webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/InflowConfigurationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/InflowConfigurationTest.java?rev=406597&r1=406595&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/InflowConfigurationTest.java (original)
+++ webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/InflowConfigurationTest.java Mon May 15 03:00:47 2006
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package org.apache.axis2.security.handler.config;
+package org.apache.rampart.handler.config;
-import junit.framework.TestCase;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerConstants;
+
+import junit.framework.TestCase;
public class InflowConfigurationTest extends TestCase {
Modified: webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/OutflowConfigurationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/OutflowConfigurationTest.java?rev=406597&r1=406595&r2=406597&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/OutflowConfigurationTest.java (original)
+++ webservices/axis2/trunk/java/modules/security/test/org/apache/rampart/handler/config/OutflowConfigurationTest.java Mon May 15 03:00:47 2006
@@ -14,12 +14,13 @@
* limitations under the License.
*/
-package org.apache.axis2.security.handler.config;
+package org.apache.rampart.handler.config;
-import junit.framework.TestCase;
-import org.apache.axis2.security.handler.WSSHandlerConstants;
+import org.apache.rampart.handler.WSSHandlerConstants;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.handler.WSHandlerConstants;
+
+import junit.framework.TestCase;
/**
* Tests the org.apache.axis2.security.handler.config.OutflowConfiguration