You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/05/18 13:58:21 UTC
svn commit: r945602 - in /tuscany/sca-java-2.x/trunk/samples/binding-rmi:
contribution-calculator-reference/ contribution-calculator-service/
Author: slaws
Date: Tue May 18 11:58:21 2010
New Revision: 945602
URL: http://svn.apache.org/viewvc?rev=945602&view=rev
Log:
copy binding-rmi related contributions into a binding-rmi extension subdirectory
Added:
tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/
- copied from r945534, tuscany/sca-java-2.x/trunk/samples/calculator-rmi-reference/
tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/
- copied from r945534, tuscany/sca-java-2.x/trunk/samples/calculator-rmi-service/
Removed:
tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/calculator-rmi-reference.png
tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/calculator-rmi-reference.svg
tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/calculator-rmi-service.png
tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/calculator-rmi-service.svg
Modified:
tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/build.xml
tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/pom.xml
tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/build.xml
tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/pom.xml
Modified: tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/build.xml?rev=945602&r1=945534&r2=945602&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/build.xml Tue May 18 11:58:21 2010
@@ -17,29 +17,30 @@
* under the License.
-->
-<project name="binding-rmi-calculator-reference" default="run">
+<project name="contribution-binding-rmi-calculator-reference" default="compile">
- <property name="jar.name" value="sample-calculator-rmi-reference.jar" />
- <property name="main.class" value="calculator.CalculatorClient" />
+ <property name="tuscany.home" value="../.."/>
+ <property name="jar.name" value="contribution-calculator-reference.jar" />
+
+ <echo>${tuscany.home}</echo>
- <target name="init">
+ <target name="init">
<delete quiet="true" includeemptydirs="true">
<fileset dir="target"/>
</delete>
<mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
+ </target>
+
+ <target name="compile" depends="init">
<javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5"
- failonerror="true">
+ destdir="target/classes"
+ debug="on"
+ source="1.5"
+ target="1.5"
+ failonerror="true">
<classpath>
- <fileset dir="../../modules">
+ <fileset dir="${tuscany.home}/lib">
<include name="tuscany-sca-api-*.jar" />
- <include name="tuscany-node-api-*.jar" />
</fileset>
</classpath>
</javac>
@@ -50,33 +51,7 @@
<manifest>
<attribute name="Main-Class" value="${main.class}" />
</manifest>
- </jar>
- </target>
-
- <target name="run" depends="compile">
- <java classname="org.apache.tuscany.sca.launcher.LauncherMain"
- fork="true"
- failonerror="true">
- <classpath>
- <pathelement location="../../bin/launcher.jar"/>
- </classpath>
- <arg value="unmanaged"/>
- <arg value="target/${jar.name}"/>
- </java>
- </target>
-
- <!-- We need to add a client component to trigger the calculation -->
- <target name="run-equinox" depends="compile">
- <java jar="../../features/tuscany-sca-equinox-manifest.jar" fork="true">
- <jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
- <arg value="-composite"/>
- <arg value="CalculatorRMIReference.composite"/>
- <arg value="-config"/>
- <arg value="../../features/configuration"/>
- <arg value="-ttl"/>
- <arg value="0"/>
- <arg value="target/${jar.name}"/>
- </java>
+ </jar>
</target>
</project>
Modified: tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/pom.xml?rev=945602&r1=945534&r2=945602&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-reference/pom.xml Tue May 18 11:58:21 2010
@@ -25,8 +25,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>sample-calculator-rmi-reference</artifactId>
- <name>Apache Tuscany SCA Sample Calculator RMI Reference</name>
+ <artifactId>sample-contribution-binding-rmi-calculator-reference</artifactId>
+ <name>Apache Tuscany SCA Sample Contribution binding-rmi Calculator Reference</name>
<dependencies>
<dependency>
@@ -40,7 +40,6 @@
<version>2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
@@ -64,18 +63,6 @@
<build>
<finalName>${artifactId}</finalName>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifest>
- <mainClass>calculator.CalculatorClient</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/build.xml?rev=945602&r1=945534&r2=945602&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/build.xml Tue May 18 11:58:21 2010
@@ -17,29 +17,30 @@
* under the License.
-->
-<project name="binding-rmi-calculator-service" default="run">
+<project name="contribution-binding-rmi-calculator-service" default="compile">
- <property name="jar.name" value="sample-calculator-rmi-service.jar" />
- <property name="main.class" value="calculator.CalculatorClient" />
+ <property name="tuscany.home" value="../.."/>
+ <property name="jar.name" value="contribution-calculator-service.jar" />
+
+ <echo>${tuscany.home}</echo>
- <target name="init">
+ <target name="init">
<delete quiet="true" includeemptydirs="true">
<fileset dir="target"/>
</delete>
<mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
+ </target>
+
+ <target name="compile" depends="init">
<javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5"
- failonerror="true">
+ destdir="target/classes"
+ debug="on"
+ source="1.5"
+ target="1.5"
+ failonerror="true">
<classpath>
- <fileset dir="../../modules">
+ <fileset dir="${tuscany.home}/lib">
<include name="tuscany-sca-api-*.jar" />
- <include name="tuscany-node-api-*.jar" />
</fileset>
</classpath>
</javac>
@@ -47,30 +48,12 @@
<fileset dir="src/main/resources"/>
</copy>
<jar destfile="target/${jar.name}" basedir="target/classes">
- </jar>
- </target>
-
- <target name="run" depends="compile">
- <java classname="org.apache.tuscany.sca.launcher.LauncherMain"
- fork="true"
- failonerror="true">
- <classpath>
- <pathelement location="../../bin/launcher.jar"/>
- </classpath>
- <arg value="target/${jar.name}"/>
- </java>
- </target>
-
- <target name="run-equinox" depends="compile">
- <java jar="../../features/tuscany-sca-equinox-manifest.jar" fork="true">
- <jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
- <arg value="-config"/>
- <arg value="../../features/configuration"/>
- <arg value="target/${jar.name}"/>
- </java>
+ <manifest>
+ <attribute name="Main-Class" value="${main.class}" />
+ </manifest>
+ </jar>
</target>
-
</project>
Modified: tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/pom.xml?rev=945602&r1=945534&r2=945602&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/binding-rmi/contribution-calculator-service/pom.xml Tue May 18 11:58:21 2010
@@ -25,8 +25,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>sample-calculator-rmi-service</artifactId>
- <name>Apache Tuscany SCA Sample Calculator RMI Service</name>
+ <artifactId>sample-contribution-binding-rmi-calculator-service</artifactId>
+ <name>Apache Tuscany SCA Sample Contribution binding-rmi Calculator Service</name>
<dependencies>
<dependency>