You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ra...@apache.org on 2008/11/25 11:50:52 UTC
svn commit: r720463 - in /tuscany/branches/sca-java-1.x/samples:
calculator-corba-reference/src/main/java/calculator/
calculator-distributed/ calculator-implementation-policies/
customer-dojo-webapp/ customer-dojo/ domain-management/ helloworld-service...
Author: ramkumar
Date: Tue Nov 25 02:50:50 2008
New Revision: 720463
URL: http://svn.apache.org/viewvc?rev=720463&view=rev
Log:
Fixes for TUSCANY-2687
Modified:
tuscany/branches/sca-java-1.x/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
tuscany/branches/sca-java-1.x/samples/calculator-distributed/build.xml
tuscany/branches/sca-java-1.x/samples/calculator-implementation-policies/build.xml
tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/build.xml
tuscany/branches/sca-java-1.x/samples/customer-dojo/build.xml
tuscany/branches/sca-java-1.x/samples/domain-management/pom.xml
tuscany/branches/sca-java-1.x/samples/helloworld-service-jms/build.xml
tuscany/branches/sca-java-1.x/samples/photo-gallery/build.xml
tuscany/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/build.xml
tuscany/branches/sca-java-1.x/samples/store-distributed/build.xml
Modified: tuscany/branches/sca-java-1.x/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java?rev=720463&r1=720462&r2=720463&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java (original)
+++ tuscany/branches/sca-java-1.x/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java Tue Nov 25 02:50:50 2008
@@ -27,7 +27,7 @@
*/
public class CalculatorClient {
public static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("CalculatorRMIReference.composite");
+ SCADomain scaDomain = SCADomain.newInstance("CalculatorCORBAReference.composite");
CalculatorService calculatorService =
scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
Modified: tuscany/branches/sca-java-1.x/samples/calculator-distributed/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-distributed/build.xml?rev=720463&r1=720462&r2=720463&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-distributed/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/calculator-distributed/build.xml Tue Nov 25 02:50:50 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="calculator" default="runDomain">
+<project name="calculator-distributed" default="runDomain">
<property name="test.jar" value="sample-calculator-distributed.jar" />
<target name="init">
@@ -31,8 +31,8 @@
target="1.5">
<classpath>
<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
+ <pathelement location="../../modules/tuscany-node-api-1.4-SNAPSHOT.jar"/>
+ <pathelement location="../../modules/tuscany-node-launcher-1.4-SNAPSHOT.jar"/>
</classpath>
</javac>
<copy todir="target/classes">
@@ -53,8 +53,8 @@
<pathelement path="target/classes"/>
<pathelement path="target/${test.jar}"/>
<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
+ <pathelement location="../../modules/tuscany-node-api-1.4-SNAPSHOT.jar"/>
+ <pathelement location="../../modules/tuscany-node-launcher-1.4-SNAPSHOT.jar"/>
</classpath>
</java>
</target>
@@ -67,8 +67,8 @@
<pathelement path="target/classes"/>
<pathelement path="target/${test.jar}"/>
<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
+ <pathelement location="../../modules/tuscany-node-api-1.4-SNAPSHOT.jar"/>
+ <pathelement location="../../modules/tuscany-node-launcher-1.4-SNAPSHOT.jar"/>
</classpath>
</java>
</target>
@@ -81,8 +81,8 @@
<pathelement path="target/classes"/>
<pathelement path="target/${test.jar}"/>
<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
+ <pathelement location="../../modules/tuscany-node-api-1.4-SNAPSHOT.jar"/>
+ <pathelement location="../../modules/tuscany-node-launcher-1.4-SNAPSHOT.jar"/>
</classpath>
</java>
</target>
@@ -95,8 +95,8 @@
<pathelement path="target/classes"/>
<pathelement path="target/${test.jar}"/>
<pathelement location="../../modules/tuscany-sca-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="../../modules/tuscany-node2-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="../../modules/tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
+ <pathelement location="../../modules/tuscany-node-api-1.4-SNAPSHOT.jar"/>
+ <pathelement location="../../modules/tuscany-node-launcher-1.4-SNAPSHOT.jar"/>
</classpath>
</java>
</target>
Modified: tuscany/branches/sca-java-1.x/samples/calculator-implementation-policies/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/calculator-implementation-policies/build.xml?rev=720463&r1=720462&r2=720463&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/calculator-implementation-policies/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/calculator-implementation-policies/build.xml Tue Nov 25 02:50:50 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="calculator" default="compile">
+<project name="calculator-impl-policies" default="compile">
<property name="test.class" value="calculator.CalculatorClient" />
<property name="test.jar" value="sample-calculator-impl-policies.jar" />
Modified: tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/build.xml?rev=720463&r1=720462&r2=720463&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp/build.xml Tue Nov 25 02:50:50 2008
@@ -20,7 +20,7 @@
<!ENTITY buildDependency SYSTEM "build-dependency.xml">
]>
-<project name="sample-helloworld-dojo-webapp" default="compile">
+<project name="sample-customer-dojo-webapp" default="compile">
&buildDependency;
Modified: tuscany/branches/sca-java-1.x/samples/customer-dojo/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/customer-dojo/build.xml?rev=720463&r1=720462&r2=720463&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/customer-dojo/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/customer-dojo/build.xml Tue Nov 25 02:50:50 2008
@@ -20,7 +20,7 @@
<!ENTITY buildDependency SYSTEM "build-dependency.xml">
]>
-<project name="sample-helloworld-dojo-webapp" default="compile">
+<project name="sample-customer-dojo" default="compile">
&buildDependency;
Modified: tuscany/branches/sca-java-1.x/samples/domain-management/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/domain-management/pom.xml?rev=720463&r1=720462&r2=720463&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/domain-management/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/domain-management/pom.xml Tue Nov 25 02:50:50 2008
@@ -106,14 +106,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-monitor</artifactId>
<version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-monitor-logging</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>xerces</groupId>
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-service-jms/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-service-jms/build.xml?rev=720463&r1=720462&r2=720463&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-service-jms/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-service-jms/build.xml Tue Nov 25 02:50:50 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="helloworld-ws-service-jms" default="compile">
+<project name="helloworld-service-jms" default="compile">
<property name="test.class" value="helloworld.HelloWorldServer" />
- <property name="test.jar" value="sample-helloworld-ws-service-jms.jar" />
+ <property name="test.jar" value="sample-helloworld-service-jms.jar" />
<target name="init">
<mkdir dir="target/classes"/>
Modified: tuscany/branches/sca-java-1.x/samples/photo-gallery/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/photo-gallery/build.xml?rev=720463&r1=720462&r2=720463&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/photo-gallery/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/photo-gallery/build.xml Tue Nov 25 02:50:50 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="store" default="compile">
+<project name="photo-gallary" default="compile">
<property name="test.class" value="launch.Launch" />
- <property name="test.jar" value="sample-store.jar" />
+ <property name="test.jar" value="sample-photo-gallary.jar" />
<target name="init">
<mkdir dir="target/classes"/>
Modified: tuscany/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/build.xml?rev=720463&r1=720462&r2=720463&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/build.xml Tue Nov 25 02:50:50 2008
@@ -19,7 +19,7 @@
-->
<project name="spring-bigbank-checkaccount" default="run">
<property name="test.class" value="bigbank.account.checking.server.CheckingAccountServer" />
- <property name="test.jar" value="sample-spring-bigbank-calculator.jar" />
+ <property name="test.jar" value="sample-spring-bigbank-checkaccount.jar" />
<target name="init">
<mkdir dir="target/classes"/>
Modified: tuscany/branches/sca-java-1.x/samples/store-distributed/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store-distributed/build.xml?rev=720463&r1=720462&r2=720463&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/store-distributed/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/store-distributed/build.xml Tue Nov 25 02:50:50 2008
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="store" default="compile">
+<project name="store-distributed" default="compile">
<property name="test.class" value="launch.Launch" />
- <property name="test.jar" value="sample-store.jar" />
+ <property name="test.jar" value="sample-store-distributed.jar" />
<target name="init">
<mkdir dir="target/classes"/>