From 23e8b27b3e02ef754a9293c8f5cdbf1ba762cc72 Mon Sep 17 00:00:00 2001 From: slaws Date: Sun, 14 Nov 2010 15:43:48 +0000 Subject: Correct some version numbers in Beta1. Some of these are in comments and some are not actually used but it removes the noise when I scan the code. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035014 13f79535-47bb-0310-9956-ffa450edef68 --- .../all/src/main/release/launcher/README | 2 +- .../apache/tuscany/sca/binding/ws/xml/test1.wsdl | 2 +- .../sca/domain/node/GetServiceTestCase.java | 8 ++-- .../domain/node/MultipleNodesPerJVMTestCase.java | 8 ++-- .../tuscany/sca/domain/node/OneNodeTestCase.java | 4 +- .../sca/domain/node/StopStartNodesTestCase.java | 6 +-- .../tuscany/sca/interfacedef/wsdl/xml/test1.wsdl | 2 +- .../maven-osgi-junit/calculator-rest-osgi/pom.xml | 10 ++--- .../2.0-Beta1/samples/running-tuscany/maven/README | 2 +- .../dependencies/ValidateDependenciesTestCase.java | 2 +- .../testing/itest/bpel/helloworld-ws/pom.xml | 2 +- .../src/test/java/itest/Client.java | 2 +- .../itest/scdl/ValidateDependenciesTestCase.java | 48 +++++++++++----------- 13 files changed, 49 insertions(+), 49 deletions(-) diff --git a/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/launcher/README b/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/launcher/README index d651dfdeb7..d92e685f33 100644 --- a/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/launcher/README +++ b/sca-java-2.x/branches/2.0-Beta1/distribution/all/src/main/release/launcher/README @@ -26,7 +26,7 @@ Tuscany developers may find it useful to add the script from their SVN checkout development build to their environment so as to start runtimes using their local trunk build, for example: -set PATH=%PATH%;\Tuscany\SVN\trunk\distribution\all\target\apache-tuscany-sca-all-2.0-SNAPSHOT-dir\tuscany-sca-2.0-SNAPSHOT\bin +set PATH=%PATH%;\Tuscany\SVN\trunk\distribution\all\target\apache-tuscany-sca-all-2.0-Beta1-dir\tuscany-sca-2.0-Beta1\bin diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl index 8e26f7b4b5..d53104b0ca 100644 --- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl +++ b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl @@ -38,7 +38,7 @@ - + diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java b/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java index 0a5d99ae7c..2c0583e3e8 100644 --- a/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java +++ b/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java @@ -40,8 +40,8 @@ public class GetServiceTestCase{ @Test public void testTwoNodesSameDomain() throws Exception { - serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); + serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-Beta1.jar"); + clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-Beta1.jar"); Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService"); assertNotNull(service); @@ -54,12 +54,12 @@ public class GetServiceTestCase{ @Test public void testTwoNodesDifferentDomains() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"}); + serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-Beta1.jar"}); Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService"); assertNotNull(service); assertEquals("Hello Petra", service.sayHello("Petra")); - clientNode = new DomainNode("vm://barDomain", new String[] {"target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"}); + clientNode = new DomainNode("vm://barDomain", new String[] {"target/test-classes/itest-nodes-helloworld-client-2.0-Beta1.jar"}); Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient"); assertNotNull(client); diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java b/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java index 617876586b..1f90b3953e 100644 --- a/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java +++ b/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java @@ -43,8 +43,8 @@ public class MultipleNodesPerJVMTestCase{ @Test public void testTwoNodesSameDomain() throws Exception { - serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); + serviceNode = new DomainNode("target/test-classes/itest-nodes-helloworld-service-2.0-Beta1.jar"); + clientNode = new DomainNode("target/test-classes/itest-nodes-helloworld-client-2.0-Beta1.jar"); Helloworld service = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService"); assertNotNull(service); @@ -57,12 +57,12 @@ public class MultipleNodesPerJVMTestCase{ @Test public void testTwoNodesDifferentDomains() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"}); + serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-Beta1.jar"}); Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService"); assertNotNull(service); assertEquals("Hello Petra", service.sayHello("Petra")); - clientNode = new DomainNode("vm://barDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"}); + clientNode = new DomainNode("vm://barDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-Beta1.jar"}); Helloworld client = SCAClientFactory.newInstance(URI.create("vm://barDomain")).getService(Helloworld.class, "HelloworldClient"); assertNotNull(client); diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java b/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java index 10803cd880..aef93986fc 100644 --- a/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java +++ b/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java @@ -46,8 +46,8 @@ public class OneNodeTestCase{ @Before public void setUpBeforeClass() throws Exception { domain = new DomainNode(); - serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"); - domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"); + serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-Beta1.jar"); + domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-Beta1.jar"); } @Test diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java b/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java index 4a29822069..febea897fa 100644 --- a/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java +++ b/sca-java-2.x/branches/2.0-Beta1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java @@ -42,8 +42,8 @@ public class StopStartNodesTestCase{ @Test public void testTwoNodesSameDomain() throws Exception { - serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"}); - clientNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"}); + serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-Beta1.jar"}); + clientNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-Beta1.jar"}); Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService"); assertNotNull(service); @@ -64,7 +64,7 @@ public class StopStartNodesTestCase{ // expected } - serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"}); + serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-Beta1.jar"}); client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient"); assertNotNull(client); assertEquals("Hi Hello Petra", client.sayHello("Petra")); diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl b/sca-java-2.x/branches/2.0-Beta1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl index 8e26f7b4b5..d53104b0ca 100644 --- a/sca-java-2.x/branches/2.0-Beta1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl +++ b/sca-java-2.x/branches/2.0-Beta1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl @@ -38,7 +38,7 @@ - + diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml index e241f891f1..a63b11485c 100644 --- a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml @@ -32,27 +32,27 @@ org.apache.tuscany.sca tuscany-core-runtime-pom - 2.0-SNAPSHOT + 2.0-Beta1-SNAPSHOT pom org.apache.tuscany.sca tuscany-osgi-runtime-pom - 2.0-SNAPSHOT + 2.0-Beta1-SNAPSHOT pom org.apache.tuscany.sca tuscany-binding-rest-runtime - 2.0-SNAPSHOT + 2.0-Beta1-SNAPSHOT org.apache.tuscany.sca tuscany-base-runtime-pom - 2.0-SNAPSHOT + 2.0-Beta1-SNAPSHOT test pom @@ -75,7 +75,7 @@ org.apache.tuscany.sca tuscany-host-jetty - 2.0-SNAPSHOT + 2.0-Beta1-SNAPSHOT test diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven/README b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven/README index ff976c3515..61a1e13081 100644 --- a/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven/README +++ b/sca-java-2.x/branches/2.0-Beta1/samples/running-tuscany/maven/README @@ -5,7 +5,7 @@ look for contributions that have the following configuration in their pom.xml fi org.apache.tuscany.maven.plugins maven-tuscany-plugin - 2.0-SNAPSHOT + 2.0-Beta1 For contributions that have this, for example, binding-sca/contribution-calculator, do the following diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java b/sca-java-2.x/branches/2.0-Beta1/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java index 2cdd77bde7..8f482051cd 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java @@ -35,7 +35,7 @@ import org.junit.Test; * Current required jars are: * asm-3.1.jar * cglib-2.2.jar - * tuscany-base-2.0-SNAPSHOT.jar + * tuscany-base-2.0-Beta1.jar * wsdl4j-1.6.2.jar * XmlSchema-1.4.3.jar * diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/bpel/helloworld-ws/pom.xml index f214559f23..25939ae39a 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/bpel/helloworld-ws/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/bpel/helloworld-ws/pom.xml @@ -70,7 +70,7 @@ org.apache.tuscany.sca tuscany-host-jetty - 1.6-SNAPSHOT + 2.0-Beta1-SNAPSHOT runtime diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java b/sca-java-2.x/branches/2.0-Beta1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java index eef3362c10..0fa0fbbd49 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java @@ -47,7 +47,7 @@ public class Client { throw ex; } -// clientNode = new DomainNode("tribes:default", new String []{"../helloworld-client/target/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"}); +// clientNode = new DomainNode("tribes:default", new String []{"../helloworld-client/target/itest-nodes-helloworld-client-2.0-Beta1.jar"}); } @Test diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/sca-java-2.x/branches/2.0-Beta1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java index 7923492776..6e1db04bdb 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java @@ -41,30 +41,30 @@ import org.junit.Test; * jsr181-api-1.0-MR1.jar * jsr250-api-1.0.jar * junit-4.8.1.jar - * tuscany-assembly-2.0-SNAPSHOT.jar - * tuscany-assembly-xml-2.0-SNAPSHOT.jar - * tuscany-assembly-xsd-2.0-SNAPSHOT.jar - * tuscany-binding-http-2.0-SNAPSHOT.jar - * tuscany-binding-jms-2.0-SNAPSHOT.jar - * tuscany-binding-jsonp-2.0-SNAPSHOT.jar - * tuscany-binding-rmi-2.0-SNAPSHOT.jar - * tuscany-binding-ws-2.0-SNAPSHOT.jar - * tuscany-builder-2.0-SNAPSHOT.jar - * tuscany-common-java-2.0-SNAPSHOT.jar - * tuscany-common-xml-2.0-SNAPSHOT.jar - * tuscany-contribution-2.0-SNAPSHOT.jar - * tuscany-core-spi-2.0-SNAPSHOT.jar - * tuscany-databinding-2.0-SNAPSHOT.jar - * tuscany-databinding-jaxb-2.0-SNAPSHOT.jar - * tuscany-deployment-2.0-SNAPSHOT.jar - * tuscany-extensibility-2.0-SNAPSHOT.jar - * tuscany-implementation-java-2.0-SNAPSHOT.jar - * tuscany-interface-java-2.0-SNAPSHOT.jar - * tuscany-interface-java-jaxws-2.0-SNAPSHOT.jar - * tuscany-interface-wsdl-2.0-SNAPSHOT.jar - * tuscany-monitor-2.0-SNAPSHOT.jar - * tuscany-sca-api-2.0-SNAPSHOT.jar - * tuscany-xsd-2.0-SNAPSHOT.jar + * tuscany-assembly-2.0-Beta1.jar + * tuscany-assembly-xml-2.0-Beta1.jar + * tuscany-assembly-xsd-2.0-Beta1.jar + * tuscany-binding-http-2.0-Beta1.jar + * tuscany-binding-jms-2.0-Beta1.jar + * tuscany-binding-jsonp-2.0-Beta1.jar + * tuscany-binding-rmi-2.0-Beta1.jar + * tuscany-binding-ws-2.0-Beta1.jar + * tuscany-builder-2.0-Beta1.jar + * tuscany-common-java-2.0-Beta1.jar + * tuscany-common-xml-2.0-Beta1.jar + * tuscany-contribution-2.0-Beta1.jar + * tuscany-core-spi-2.0-Beta1.jar + * tuscany-databinding-2.0-Beta1.jar + * tuscany-databinding-jaxb-2.0-Beta1.jar + * tuscany-deployment-2.0-Beta1.jar + * tuscany-extensibility-2.0-Beta1.jar + * tuscany-implementation-java-2.0-Beta1.jar + * tuscany-interface-java-2.0-Beta1.jar + * tuscany-interface-java-jaxws-2.0-Beta1.jar + * tuscany-interface-wsdl-2.0-Beta1.jar + * tuscany-monitor-2.0-Beta1.jar + * tuscany-sca-api-2.0-Beta1.jar + * tuscany-xsd-2.0-Beta1.jar * wsdl4j-1.6.2.jar * wstx-asl-3.2.4.jar * XmlSchema-1.4.3.jar -- cgit v1.2.3