You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2008/10/18 02:20:28 UTC

svn commit: r705826 - in /ode/branches/APACHE_ODE_1.X: ./ axis2-war/src/test/java/org/apache/ode/axis2/ axis2-war/src/test/resources/TestRampart/ axis2-war/src/test/resources/TestRampart/process-template/ axis2-war/src/test/resources/TestRampart/servic...

Author: midon
Date: Fri Oct 17 17:20:27 2008
New Revision: 705826

URL: http://svn.apache.org/viewvc?rev=705826&view=rev
Log:
ODE-388: rename TestRampart/ into TestRampartPolicy/

Added:
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartPolicyTest.java
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartTest.java
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample01.txt
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample01.txt
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample02.txt
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample02.txt
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample03.txt
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample03.txt
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample04.txt
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample04.txt
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/client.jks
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.jks
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample01.xml
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample01.xml
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample02.xml
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample03.xml
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample04.xml
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.bpel
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/HelloWorld2.bpel
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.wsdl
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/HelloWorld2.wsdl
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/config.endpoint
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/config.endpoint
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/deploy.xml
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/deploy.xml
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/echo-service.wsdl
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/echo-service.wsdl
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/testRequest.soap
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/testRequest.soap
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/readme.txt
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/readme.txt
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample01.aar
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample01.aar
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample02.aar
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample02.aar
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample03.aar
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample03.aar
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample04.aar
      - copied, changed from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample04.aar
Removed:
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartTest.java
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample01.txt
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample02.txt
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample03.txt
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample04.txt
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.jks
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample01.xml
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample02.xml
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample03.xml
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample04.xml
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/HelloWorld2.bpel
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/HelloWorld2.wsdl
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/config.endpoint
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/deploy.xml
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/echo-service.wsdl
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/testRequest.soap
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/readme.txt
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample01.aar
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample02.aar
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample03.aar
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample04.aar
Modified:
    ode/branches/APACHE_ODE_1.X/Rakefile

Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=705826&r1=705825&r2=705826&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Fri Oct 17 17:20:27 2008
@@ -213,9 +213,9 @@
     test.setup unzip(_("target/test-classes/webapp/WEB-INF")=>project("dao-jpa-ojpa-derby").package(:zip))
     test.setup unzip(_("target/test-classes/webapp/WEB-INF")=>project("dao-hibernate-db").package(:zip))
     
-    test.setup task(:prepare_rampart_test) do |task|
+    test.setup task(:prepare_rampart_policy_test) do |task|
       # test_dir will be the Axis2 Repo dir
-      test_dir = _("target/test-classes/TestRampart")
+      test_dir = _("target/test-classes/TestRampartPolicy")
       # copy the required modules
       mkdir "#{test_dir}/modules" unless File.directory? "#{test_dir}/modules"
       artifacts(AXIS2_MODULES.mods).map {|a| a.invoke }

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartPolicyTest.java (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartTest.java)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartPolicyTest.java?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartPolicyTest.java&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartTest.java&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartTest.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/RampartPolicyTest.java Fri Oct 17 17:20:27 2008
@@ -19,38 +19,31 @@
 
 package org.apache.ode.axis2;
 
-import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.testng.annotations.Test;
-import org.testng.annotations.Factory;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.AfterMethod;
+import static org.testng.AssertJUnit.assertTrue;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
-import static org.testng.AssertJUnit.assertTrue;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
 
-import java.net.URL;
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.FileFilter;
-import java.util.Arrays;
 
 /**
  *
  *
  */
-public class RampartTest extends Axis2TestBase {
+public class RampartPolicyTest extends Axis2TestBase {
 
     @DataProvider(name = "bundles")
     public Object[][] testPolicySamples() throws Exception {
-        File[] policies = new File(getClass().getClassLoader().getResource("TestRampart").getFile()).listFiles(new FileFilter() {
+        File[] policies = new File(getClass().getClassLoader().getResource("TestRampartPolicy").getFile()).listFiles(new FileFilter() {
             public boolean accept(File pathname) {
                 return pathname.isDirectory() && pathname.getName().matches("process-policy-sample\\d*");
             }
         });
         Object[][] bundles = new Object[policies.length][];
         for (int i = 0; i < policies.length; i++) {
-            bundles[i] = new Object[]{"TestRampart/" + policies[i].getName()};
+            bundles[i] = new Object[]{"TestRampartPolicy/" + policies[i].getName()};
         }
         return bundles;
     }
@@ -59,7 +52,7 @@
     @BeforeClass
     protected void setUp() throws Exception {
         // mind the annotation above also
-        startServer("TestRampart", "webapp/WEB-INF/conf/axis2.xml");
+        startServer("TestRampartPolicy", "webapp/WEB-INF/conf/axis2.xml");
     }
 
     @AfterClass
@@ -70,7 +63,7 @@
 
     @Test(dataProvider = "bundles")
     public void executeProcess(String bundleName) throws Exception {
-        if (server.isDeployed(new File(bundleName).getName())){
+        if (server.isDeployed(new File(bundleName).getName())) {
             server.undeployProcess(bundleName);
         }
         server.deployProcess(bundleName);

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample01.txt (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample01.txt)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample01.txt?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample01.txt&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample01.txt&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample02.txt (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample02.txt)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample02.txt?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample02.txt&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample02.txt&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample03.txt (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample03.txt)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample03.txt?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample03.txt&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample03.txt&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample04.txt (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample04.txt)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample04.txt?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/README-policy-sample04.txt&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/README-policy-sample04.txt&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/client.jks (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.jks)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/client.jks?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/client.jks&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/client.jks&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample01.xml (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample01.xml)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample01.xml?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample01.xml&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample01.xml&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample02.xml)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample02.xml&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample02.xml (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml Fri Oct 17 17:20:27 2008
@@ -70,7 +70,7 @@
 				<ramp:signatureCrypto>
 					<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
-						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampart/client.jks</ramp:property>
+						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/client.jks</ramp:property>
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
 					</ramp:crypto>
 				</ramp:signatureCrypto>

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample03.xml)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample03.xml&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample03.xml (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml Fri Oct 17 17:20:27 2008
@@ -74,14 +74,14 @@
 				<ramp:signatureCrypto>
 					<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
-						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampart/client.jks</ramp:property>
+						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/client.jks</ramp:property>
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
 					</ramp:crypto>
 				</ramp:signatureCrypto>
 				<ramp:encryptionCypto>
 					<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
-						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampart/client.jks</ramp:property>
+						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/client.jks</ramp:property>
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
 					</ramp:crypto>
 				</ramp:encryptionCypto>

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample04.xml)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample04.xml&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/policy-sample04.xml (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml Fri Oct 17 17:20:27 2008
@@ -132,14 +132,14 @@
 				<ramp:signatureCrypto>
 					<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
-						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampart/client.jks</ramp:property>
+						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/client.jks</ramp:property>
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
 					</ramp:crypto>
 				</ramp:signatureCrypto>
 				<ramp:encryptionCypto>
 					<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
-						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampart/client.jks</ramp:property>
+						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/client.jks</ramp:property>
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
 					</ramp:crypto>
 				</ramp:encryptionCypto>

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.bpel (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/HelloWorld2.bpel)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.bpel?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.bpel&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/HelloWorld2.bpel&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.wsdl (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/HelloWorld2.wsdl)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.wsdl?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.wsdl&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/HelloWorld2.wsdl&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/config.endpoint (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/config.endpoint)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/config.endpoint?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/config.endpoint&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/config.endpoint&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/deploy.xml (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/deploy.xml)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/deploy.xml?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/deploy.xml&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/deploy.xml&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/echo-service.wsdl (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/echo-service.wsdl)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/echo-service.wsdl?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/echo-service.wsdl&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/echo-service.wsdl&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/testRequest.soap (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/testRequest.soap)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/testRequest.soap?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/process-template/testRequest.soap&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/process-template/testRequest.soap&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/readme.txt (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/readme.txt)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/readme.txt?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/readme.txt&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/readme.txt&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/readme.txt (original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/readme.txt Fri Oct 17 17:20:27 2008
@@ -1,19 +1,19 @@
 
 
-How does TestRampart bundle work?
+How does TestRampartPolicy bundle work?
 ========================================
 
 The goal of this test is to make sure Rampart is integrated properly.
 Rampart comes with a set of samples [1]. A subset of them test the same service with different security policies.
 
-Here we reuse the policy samples and for each of them generate a process bundle based on the TestRampart/process-template.
+Here we reuse the policy samples and for each of them generate a process bundle based on the TestRampartPolicy/process-template.
 The qname of the services vary so two variables are replaced:
 {sample.namespace}
 {sample.service.name}
 
-This is done before running the tests in the Rakefile, see task :prepare_rampart_test.
+This is done before running the tests in the Rakefile, see task :prepare_rampart_policy_test.
 
-The external services are packaged as Axis archives in TestRampart/services.
+The external services are packaged as Axis archives in TestRampartPolicy/services.
 The Password Callback Handler classes are in src/test/java.
 
 [1] https://svn.apache.org/repos/asf/webservices/rampart/trunk/java/modules/rampart-samples/policy/
\ No newline at end of file

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample01.aar (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample01.aar)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample01.aar?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample01.aar&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample01.aar&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample02.aar (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample02.aar)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample02.aar?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample02.aar&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample02.aar&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample03.aar (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample03.aar)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample03.aar?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample03.aar&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample03.aar&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)

Copied: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample04.aar (from r705825, ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample04.aar)
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample04.aar?p2=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample04.aar&p1=ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampart/services/policy-sample04.aar&r1=705825&r2=705826&rev=705826&view=diff
==============================================================================
    (empty)