Return-Path: Delivered-To: apmail-ode-commits-archive@www.apache.org Received: (qmail 38392 invoked from network); 4 Jun 2009 18:22:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Jun 2009 18:22:15 -0000 Received: (qmail 5516 invoked by uid 500); 4 Jun 2009 18:22:27 -0000 Delivered-To: apmail-ode-commits-archive@ode.apache.org Received: (qmail 5474 invoked by uid 500); 4 Jun 2009 18:22:27 -0000 Mailing-List: contact commits-help@ode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ode.apache.org Delivered-To: mailing list commits@ode.apache.org Received: (qmail 5465 invoked by uid 99); 4 Jun 2009 18:22:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jun 2009 18:22:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jun 2009 18:22:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9055D23888CB; Thu, 4 Jun 2009 18:21:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r781823 - in /ode/branches/APACHE_ODE_1.X/axis2-war/src/test: java/org/apache/ode/axis2/ resources/TestEndpointProperties/ resources/TestRampartBasic/secured-services/process-template/ resources/TestRampartPolicy/secured-services/process-sa... Date: Thu, 04 Jun 2009 18:21:59 -0000 To: commits@ode.apache.org From: midon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090604182159.9055D23888CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: midon Date: Thu Jun 4 18:21:58 2009 New Revision: 781823 URL: http://svn.apache.org/viewvc?rev=781823&view=rev Log: ODE-619: update existing system placeholders to the new pattern: ${system.*} Modified: 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/resources/TestEndpointProperties/test-endpoint-properties_global_conf.endpoint 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/resources/TestRampartPolicy/secured-services/process-template/config.endpoint ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestSoapHeader/location.endpoint ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint 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=781823&r1=781822&r2=781823&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 Thu Jun 4 18:21:58 2009 @@ -83,7 +83,7 @@ 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. + These properties might then be used by test cases using #getTestPort(int) or from endpoint property files using ${system.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")); 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=781823&r1=781822&r2=781823&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 Thu Jun 4 18:21:58 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:${test.port.1}/EchoService/ \ No newline at end of file +myns1.PropertiesService.ode.address=http://localhost:${system.test.port.1}/EchoService/ Modified: 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=781823&r1=781822&r2=781823&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartBasic/secured-services/process-template/config.endpoint (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartBasic/secured-services/process-template/config.endpoint Thu Jun 4 18:21:58 2009 @@ -1,5 +1,5 @@ alias.sample-ns={sample.namespace} -sample-ns.{sample.service.name}.ode.address=http://localhost:${test.port.0}/axis2/processes/{sample.service.name} +sample-ns.{sample.service.name}.ode.address=http://localhost:${system.test.port.0}/axis2/processes/{sample.service.name} Modified: 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=781823&r1=781822&r2=781823&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-sample04_policy_in_service.xml/config.endpoint (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-sample04_policy_in_service.xml/config.endpoint Thu Jun 4 18:21:58 2009 @@ -1,5 +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 +sample-ns.sample04-policy.ode.address=http://localhost:${system.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=781823&r1=781822&r2=781823&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 Thu Jun 4 18:21:58 2009 @@ -4,5 +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} +sample-ns.{sample.service.name}.ode.address=http://localhost:${system.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=781823&r1=781822&r2=781823&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 Thu Jun 4 18:21:58 2009 @@ -1,3 +1,3 @@ alias.myns=http://axis2.ode.apache.org -myns.DummyService.ode.address=http://localhost:${test.port.0}/processes/DummyService \ No newline at end of file +myns.DummyService.ode.address=http://localhost:${system.test.port.0}/processes/DummyService Modified: 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=781823&r1=781822&r2=781823&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/webapp/WEB-INF/conf/global-config.endpoint Thu Jun 4 18:21:58 2009 @@ -1,19 +1,20 @@ - +t/resources/TestRampartBasic/secured-services/process-template/config.endpoint test/resources/TestRampartPolicy/secured-services/process-template/config.endpoint test/resources/TestRampartPolicy/secured-services/process-sample04_policy_in_service.xml/config.endpoint +test/resources/TestSoapHeader/location.endpoint alias.dummy-ns=http://axis2.ode.apache.org -dummy-ns.DummyService.ode.address=http://localhost:${test.port.0}/processes/DummyService +dummy-ns.DummyService.ode.address=http://localhost:${system.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} +blog-ns.BlogService.ode.address=http://localhost:${system.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 +arithmetics-ns.ArithmeticsService.OlaElMundo-GET_httpport.ode.address=http://localhost:${system.test.port.1}/HttpBindingTest/ArithmeticsService/OlaElMundo-GET +arithmetics-ns.ArithmeticsService.OlaElMundo-POST_httpport.ode.address=http://localhost:${system.test.port.1}/HttpBindingTest/ArithmeticsService/OlaElMundo-POST +arithmetics-ns.ArithmeticsService.OlaElMundo-PUT_httpport.ode.address=http://localhost:${system.test.port.1}/HttpBindingTest/ArithmeticsService/OlaElMundo-PUT +arithmetics-ns.ArithmeticsService.OlaElMundo-DELETE_httpport.ode.address=http://localhost:${system.test.port.1}/HttpBindingTest/ArithmeticsService/OlaElMundo-DELETE +arithmetics-ns.ArithmeticsService.SalutLaTerre_httpport.ode.address=http://localhost:${system.test.port.1}/HttpBindingTest/ArithmeticsService/SalutLaTerre