ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r781236 - in /ode/branches/APACHE_ODE_1.X: ./ axis2-war/src/test/java/org/apache/ode/axis2/ axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/ axis2-war/src/test/java/org/apache/ode/axis2/management/ axis2-war/src/test/java/org/apach...
Date Wed, 03 Jun 2009 01:04:08 GMT
Author: midon
Date: Wed Jun  3 01:04:07 2009
New Revision: 781236

URL: http://svn.apache.org/viewvc?rev=781236&view=rev
Log:
ODE-618: configurable test ports

Added:
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartBasic/secured-services/process-template/config.endpoint
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-sample04_policy_in_service.xml/config.endpoint
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint
Modified:
    ode/branches/APACHE_ODE_1.X/Rakefile
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/EndpointConfigurationTest.java
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/JettyWrapper.java
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/test-endpoint-properties_global_conf.endpoint
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/config.endpoint
    ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestSoapHeader/location.endpoint

Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Wed Jun  3 01:04:07 2009
@@ -194,27 +194,27 @@
       end
     end
     
-    test.using :testng, :properties=>{ "log4j.debug" => true,  "log4j.configuration"=>"test-log4j.properties"
}
+    test.using :testng, :properties=>{ "log4j.debug" => true,  "log4j.configuration"=>"test-log4j.properties",
"test.ports" => ENV['TEST_PORTS'] }
     test.with projects("tools"), libs, AXIS2_TEST, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES,
HIBERNATE, DOM4J
     webapp_dir = "#{test.compile.target}/webapp"
     test.setup task(:prepare_webapp) do |task|
       cp_r _("src/main/webapp"), test.compile.target.to_s
-      rm_rf Dir[_(webapp_dir) + "/**/.svn"]
       cp_r _("src/test/webapp"), test.compile.target.to_s
       cp Dir[_("src/main/webapp/WEB-INF/classes/*")], test.compile.target.to_s
       cp Dir[project("axis2").path_to("src/main/wsdl/*")], "#{webapp_dir}/WEB-INF"
       cp project("bpel-schemas").path_to("src/main/xsd/pmapi.xsd"), "#{webapp_dir}/WEB-INF"
       rm_rf Dir[_(webapp_dir) + "/**/.svn"]
-      mkdir _("#{webapp_dir}/WEB-INF/processes") unless File.exist?("#{webapp_dir}/WEB-INF/processes")
-      mkdir _("#{webapp_dir}/WEB-INF/modules") unless File.exist?("#{webapp_dir}/WEB-INF/modules")
-      # move around some property files for test purpose
-      mv Dir[_("#{test.compile.target}/TestEndpointProperties/*_global_conf*.endpoint")],
"#{webapp_dir}/WEB-INF/conf"
-      artifacts(AXIS2_MODULES.mods).map {|a| a.invoke }
+      mkdir "#{webapp_dir}/WEB-INF/processes" unless File.exist?("#{webapp_dir}/WEB-INF/processes")
+      mkdir "#{webapp_dir}/WEB-INF/modules" unless File.exist?("#{webapp_dir}/WEB-INF/modules")
+      # move around some property files for test purposes
+      mv Dir["#{test.compile.target}/TestEndpointProperties/*_global_conf*.endpoint"], "#{webapp_dir}/WEB-INF/conf"
+      Dir["#{webapp_dir}/WEB-INF/conf.*"].each {|d| cp "#{webapp_dir}/WEB-INF/conf/global-config.endpoint",d}
+      artifacts(AXIS2_MODULES.mods).each(&:invoke)
       cp AXIS2_MODULES.mods.map {|a| repositories.locate(a)} , "#{webapp_dir}/WEB-INF/modules"
     end
     test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-jpa-ojpa-derby").package(:zip))
     test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-hibernate-db").package(:zip))
-    
+   
     NativeDB.prepare_configs test, _(".")
 
     test.setup WSSecurity.prepare_secure_services_tests("#{test.resources.target}/TestRampartBasic/secured-services",
"sample*.axis2", AXIS2_MODULES.mods)

Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
(original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
Wed Jun  3 01:04:07 2009
@@ -29,6 +29,7 @@
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
 import org.apache.ode.axis2.hooks.ODEAxisService;
 import org.apache.ode.axis2.util.Axis2UriResolver;
 import org.apache.ode.axis2.util.Axis2WSDLLocator;
@@ -60,7 +61,9 @@
  * @author Matthieu Riou <mriou@apache.org>
  */
 public abstract class Axis2TestBase {
-    public static final int DEFAULT_TEST_PORT = 8888;
+    private static final int DEFAULT_TEST_PORT_0 = 8888;
+    private static final int DEFAULT_TEST_PORT_1 = 7070;
+    private static final String DEFAULT_TEST_PORTS = DEFAULT_TEST_PORT_0+","+DEFAULT_TEST_PORT_1;
 
     private static final Log log = LogFactory.getLog(Axis2TestBase.class);
 
@@ -76,8 +79,25 @@
     static {
         // disable deferred process instance cleanup for faster testing
         System.setProperty(BpelServerImpl.DEFERRED_PROCESS_INSTANCE_CLEANUP_DISABLED_NAME,
"true");
+        /*
+         The property "test.ports" receives a coma-separated list of available ports.
+         Base on this list, a set of properties is created:
+            test.port.0, test.port.1, test.port.2, ...
+         These properties might then be used by test cases using #getTestPort(int) or from
endpoint property files using ${test.port.0} for instance.
+          */
+        if(StringUtils.isBlank(System.getProperty("test.ports"))) System.setProperty("test.ports",
DEFAULT_TEST_PORTS);
+        log.info("test.ports="+System.getProperty("test.ports"));
+        String[] ports = System.getProperty("test.ports").split(",");
+        for (int i = 0; i < ports.length; i++) {
+            String port = ports[i].trim();
+            System.setProperty("test.port."+i, port);
+        }
     }
-    
+
+    public int getTestPort(int index){
+        return Integer.parseInt(System.getProperty("test.port."+index));
+    }
+
     @DataProvider(name = "configs")
     protected Iterator<Object[]> createConfigData() {
         List<String> configDirList = new ArrayList<String>();
@@ -216,8 +236,8 @@
             }
 
             configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(axis2RepoDir,
axis2ConfLocation);
-            // do not use 8080 for tests
-            configContext.getAxisConfiguration().getTransportIn("http").addParameter(new
Parameter("port", ""+DEFAULT_TEST_PORT));
+            // do not use 8080 for tests, and make sure to pass a string, not an int
+            configContext.getAxisConfiguration().getTransportIn("http").addParameter(new
Parameter("port", ""+getTestPort(0)));
         }
 
         protected void start() throws AxisFault {
@@ -236,11 +256,11 @@
         }
 
         public Collection<QName> deployProcess(String bundleName) {
-            return _ode.getProcessStore().deploy(new File(getBundleDir(bundleName)));
+            return _ode.getProcessStore().deploy(new File(getResource(bundleName)));
         }
 
         public void undeployProcess(String bundleName) {
-            _ode.getProcessStore().undeploy(new File(getBundleDir(bundleName)));
+            _ode.getProcessStore().undeploy(new File(getResource(bundleName)));
         }
 
         public boolean isDeployed(String bundleName) {
@@ -253,7 +273,7 @@
          */
         protected void deployService(String bundleName, String defFile, QName serviceName,
String port,
                                      MessageReceiver receiver) throws WSDLException, IOException,
URISyntaxException {
-            URI wsdlUri = new File(getBundleDir(bundleName) + "/" + defFile).toURI();
+            URI wsdlUri = new File(getResource(bundleName) + "/" + defFile).toURI();
 
             InputStream is = wsdlUri.toURL().openStream();
             WSDL11ToAxisServiceBuilder serviceBuilder = new ODEAxisService.WSDL11ToAxisPatchedBuilder(is,
serviceName, port);
@@ -279,15 +299,24 @@
         }
 
         public String sendRequestFile(String endpoint, String bundleName, String filename)
{
+            return sendRequestFile(endpoint, bundleName + "/" + filename);
+        }
+        
+        public String sendRequestFile(String endpoint, String filename) {
             try {
-                return HttpSoapSender.doSend(new URL(endpoint),
-                        new FileInputStream(getBundleDir(bundleName) + "/" + filename), null,
0, null, null, null);
+                URL url = new URL(endpoint);
+                // override the port if necessary but only if the given port is the default
one
+                if(url.getPort()==DEFAULT_TEST_PORT_0 && url.getPort()!=getTestPort(0)){
+                    url=  new URL(url.getProtocol()+"://"+url.getHost()+":"+getTestPort(0)+url.getPath()+(url.getQuery()!=null?"?"+url.getQuery():""));
+                }
+                return HttpSoapSender.doSend(url,
+                        new FileInputStream(getResource(filename)), null, 0, null, null,
null);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
         }
 
-        protected String getBundleDir(String bundleName) {
+        protected String getResource(String bundleName) {
             return getClass().getClassLoader().getResource(bundleName).getFile();
         }
 

Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/EndpointConfigurationTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/EndpointConfigurationTest.java?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/EndpointConfigurationTest.java
(original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/EndpointConfigurationTest.java
Wed Jun  3 01:04:07 2009
@@ -43,7 +43,7 @@
     }
 
     protected void executeProcess(ContextHandler handler) throws Exception {
-        JettyWrapper jettyWrapper = new JettyWrapper(handler);
+        JettyWrapper jettyWrapper = new JettyWrapper(getTestPort(1), handler);
         jettyWrapper.start();
 
         try {

Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/JettyWrapper.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/JettyWrapper.java?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/JettyWrapper.java
(original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/JettyWrapper.java
Wed Jun  3 01:04:07 2009
@@ -56,8 +56,8 @@
     }
 
 
-    public JettyWrapper(ContextHandler handler) {
-        server = new Server(7070);
+    public JettyWrapper(int port, ContextHandler handler) {
+        server = new Server(port);
         if(handler!=null) server.addHandler(handler);
         else addDefaultHandlers();
     }

Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java
(original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/httpbinding/HttpBindingTest.java
Wed Jun  3 01:04:07 2009
@@ -53,8 +53,7 @@
   @BeforeMethod
     protected void setUp() throws Exception {
         super.setUp();
-        final CountDownLatch latch = new CountDownLatch(1);
-      jettyWrapper = new JettyWrapper(7070);
+      jettyWrapper = new JettyWrapper(getTestPort(1));
       jettyWrapper.start();
   }
 

Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
(original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/DeploymentTest.java
Wed Jun  3 01:04:07 2009
@@ -237,11 +237,11 @@
     }
 
     private OMElement sendToPM(OMElement msg) throws AxisFault {
-        return _client.send(msg, "http://localhost:8888/processes/ProcessManagement");
+        return _client.send(msg, "http://localhost:"+getTestPort(0)+"/processes/ProcessManagement");
     }
 
     private OMElement sendToDeployment(OMElement msg) throws AxisFault {
-        return _client.send(msg, "http://localhost:8888/processes/DeploymentService");
+        return _client.send(msg, "http://localhost:"+getTestPort(0)+"/processes/DeploymentService");
     }
 
 }

Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
(original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
Wed Jun  3 01:04:07 2009
@@ -231,9 +231,7 @@
         _deployedName = res.getFirstChildWithName(new QName(null, "response")).getFirstChildWithName(new
QName("http://www.apache.org/ode/deployapi", "name")).getText();
 
         // Execute
-        URL svcUrl = new URL("http://localhost:8888/processes/DynMainService");
-        InputStream sis = this.getClass().getClassLoader().getResourceAsStream("testDynPartnerRequest.soap");
-        System.out.println(HttpSoapSender.doSend(svcUrl, sis, null, 0, null, null, null));
+      System.out.println(server.sendRequestFile("http://localhost:8888/processes/DynMainService",
"testDynPartnerRequest.soap"));
         // Just making sure the instance starts
         Thread.sleep(1000);
     }
@@ -259,15 +257,15 @@
     }
 
     private OMElement sendToPM(OMElement msg) throws AxisFault {
-        return _client.send(msg, "http://localhost:8888/processes/ProcessManagement");
+        return _client.send(msg, "http://localhost:"+getTestPort(0)+"/processes/ProcessManagement");
     }
 
     private OMElement sendToIM(OMElement msg) throws AxisFault {
-        return _client.send(msg, "http://localhost:8888/processes/InstanceManagement");
+        return _client.send(msg, "http://localhost:"+getTestPort(0)+"/processes/InstanceManagement");
     }
 
     private OMElement sendToDeployment(OMElement msg) throws AxisFault {
-        return _client.send(msg, "http://localhost:8888/processes/DeploymentService");
+        return _client.send(msg, "http://localhost:"+getTestPort(0)+"/processes/DeploymentService");
     }
 
 }

Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
(original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java
Wed Jun  3 01:04:07 2009
@@ -89,7 +89,7 @@
             ConfigurationContext ctx = ConfigurationContextFactory.createConfigurationContextFromFileSystem(clientRepo,
clientConfigFile);
             ServiceClient client = new ServiceClient(ctx, null);
             Options options = new Options();
-            options.setTo(new EndpointReference("http://localhost:8888/processes/helloWorld"));
+            options.setTo(new EndpointReference("http://localhost:"+getTestPort(0)+"/processes/helloWorld"));
             client.setOptions(options);
 
             OMElement responseElement = client.sendReceive(getPayload(bundleName));

Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
(original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java
Wed Jun  3 01:04:07 2009
@@ -96,7 +96,7 @@
             Options options = new Options();
             // Rampart SymetricBinding (sample04) blows up if not provided with a soap action
             options.setAction("");
-            options.setTo(new EndpointReference("http://localhost:8888/processes/helloWorld"));
+            options.setTo(new EndpointReference("http://localhost:"+getTestPort(0)+"/processes/helloWorld"));
             options.setProperty(RampartMessageData.KEY_RAMPART_POLICY, loadPolicy(policyFile));
             client.setOptions(options);
 

Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/test-endpoint-properties_global_conf.endpoint
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/test-endpoint-properties_global_conf.endpoint?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/test-endpoint-properties_global_conf.endpoint
(original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestEndpointProperties/test-endpoint-properties_global_conf.endpoint
Wed Jun  3 01:04:07 2009
@@ -6,4 +6,4 @@
 myns.PropertiesService.ode.http.default-headers.header_AB=from_global_conf_directory_AB
 myns1.PropertiesService.ode.http.default-headers.header_AC=from_global_conf_directory_AC
 
-myns1.PropertiesService.ode.address=http://localhost:7070/EchoService/
\ No newline at end of file
+myns1.PropertiesService.ode.address=http://localhost:${test.port.1}/EchoService/
\ No newline at end of file

Added: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartBasic/secured-services/process-template/config.endpoint
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartBasic/secured-services/process-template/config.endpoint?rev=781236&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartBasic/secured-services/process-template/config.endpoint
(added)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartBasic/secured-services/process-template/config.endpoint
Wed Jun  3 01:04:07 2009
@@ -0,0 +1,5 @@
+
+
+alias.sample-ns={sample.namespace}
+sample-ns.{sample.service.name}.ode.address=http://localhost:${test.port.0}/axis2/processes/{sample.service.name}
+

Added: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-sample04_policy_in_service.xml/config.endpoint
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-sample04_policy_in_service.xml/config.endpoint?rev=781236&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-sample04_policy_in_service.xml/config.endpoint
(added)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-sample04_policy_in_service.xml/config.endpoint
Wed Jun  3 01:04:07 2009
@@ -0,0 +1,5 @@
+
+
+alias.sample-ns=http://sample04.policy.samples.rampart.apache.org
+sample-ns.sample04-policy.ode.address=http://localhost:${test.port.0}/axis2/processes/sample04-policy
+

Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/config.endpoint
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/config.endpoint?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/config.endpoint
(original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/config.endpoint
Wed Jun  3 01:04:07 2009
@@ -4,3 +4,5 @@
 sample-ns.{sample.service.name}.ode.security.policy.file={sample.service.name}.xml
 
 
+sample-ns.{sample.service.name}.ode.address=http://localhost:${test.port.0}/axis2/processes/{sample.service.name}
+

Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestSoapHeader/location.endpoint
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestSoapHeader/location.endpoint?rev=781236&r1=781235&r2=781236&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestSoapHeader/location.endpoint
(original)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestSoapHeader/location.endpoint
Wed Jun  3 01:04:07 2009
@@ -1,3 +1,3 @@
 
 alias.myns=http://axis2.ode.apache.org
-myns.DummyService.ode.address=http://localhost:8888/processes/DummyService
\ No newline at end of file
+myns.DummyService.ode.address=http://localhost:${test.port.0}/processes/DummyService
\ No newline at end of file

Added: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint?rev=781236&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint
(added)
+++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint
Wed Jun  3 01:04:07 2009
@@ -0,0 +1,19 @@
+
+
+
+alias.dummy-ns=http://axis2.ode.apache.org
+dummy-ns.DummyService.ode.address=http://localhost:${test.port.0}/processes/DummyService
+
+alias.blog-ns=http://ode/bpel/test/blog
+blog-ns.BlogService.ode.address=http://localhost:${test.port.1}/HttpBindingTest/BlogService/article/{articleId}
+
+alias.arithmetics-ns=http://ode/bpel/test/arithmetics
+
+#arithmetics-ns.ArithmeticsService.ode.host=localhost
+#arithmetics-ns.ArithmeticsService.ode.port=7070
+
+arithmetics-ns.ArithmeticsService.OlaElMundo-GET_httpport.ode.address=http://localhost:${test.port.1}/HttpBindingTest/ArithmeticsService/OlaElMundo-GET
+arithmetics-ns.ArithmeticsService.OlaElMundo-POST_httpport.ode.address=http://localhost:${test.port.1}/HttpBindingTest/ArithmeticsService/OlaElMundo-POST
+arithmetics-ns.ArithmeticsService.OlaElMundo-PUT_httpport.ode.address=http://localhost:${test.port.1}/HttpBindingTest/ArithmeticsService/OlaElMundo-PUT
+arithmetics-ns.ArithmeticsService.OlaElMundo-DELETE_httpport.ode.address=http://localhost:${test.port.1}/HttpBindingTest/ArithmeticsService/OlaElMundo-DELETE
+arithmetics-ns.ArithmeticsService.SalutLaTerre_httpport.ode.address=http://localhost:${test.port.1}/HttpBindingTest/ArithmeticsService/SalutLaTerre



Mime
View raw message