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/08/23 14:45:21 UTC
svn commit: r988103 - in /tuscany/sca-java-2.x/trunk:
itest/distribution/contribution-binding-ws-calculator/
itest/distribution/contribution-implementation-java-calculator/ samples/
samples/contribution-binding-ws-calculator/ samples/contribution-imple...
Author: slaws
Date: Mon Aug 23 12:45:21 2010
New Revision: 988103
URL: http://svn.apache.org/viewvc?rev=988103&view=rev
Log:
switch over to using binding-ws and implmentation-java in new locations.
Removed:
tuscany/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/
tuscany/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
tuscany/sca-java-2.x/trunk/samples/pom.xml
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml?rev=988103&r1=988102&r2=988103&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml Mon Aug 23 12:45:21 2010
@@ -33,7 +33,7 @@
<target name="run">
<ant antfile="build.xml"
- dir="${distro.root}/samples/contribution-binding-ws-calculator"/>
+ dir="${distro.root}/samples/binding-ws/contribution-calculator"/>
</target>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml?rev=988103&r1=988102&r2=988103&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml Mon Aug 23 12:45:21 2010
@@ -33,7 +33,7 @@
<target name="run">
<ant antfile="build.xml"
- dir="${distro.root}/samples/contribution-implementation-java-calculator"/>
+ dir="${distro.root}/samples/implementation-java/contribution-calculator"/>
</target>
Modified: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java?rev=988103&r1=988102&r2=988103&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java Mon Aug 23 12:45:21 2010
@@ -41,7 +41,7 @@ public class JSELauncherBindingWSCalcula
* Using the Tuscany Node API to get a local service proxy
*/
public void launchBindingWSCalculator(){
- Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../contribution-binding-ws-calculator/target/sample-contribution-binding-ws-calculator.jar"));
+ Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
node.start();
CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
Modified: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java?rev=988103&r1=988102&r2=988103&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java Mon Aug 23 12:45:21 2010
@@ -37,7 +37,7 @@ public class JSELauncherImplementationJa
}
public void launchImplementationJavaCalculator(){
- Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../contribution-implementation-java-calculator/target/classes"));
+ Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../implementation-java/contribution-calculator/target/classes"));
node.start();
node.stop();
Modified: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java?rev=988103&r1=988102&r2=988103&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java Mon Aug 23 12:45:21 2010
@@ -73,7 +73,7 @@ public class SampleJSELauncher extends R
* Using a Tuscany specific mechanism for getting at local service proxies
*/
public void launchBindingWSCalculator() throws NoSuchDomainException, NoSuchServiceException{
- Node node = startNode(new Contribution("c1", "../contribution-binding-ws-calculator/target/sample-contribution-binding-ws-calculator.jar"));
+ Node node = startNode(new Contribution("c1", "../binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
Modified: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java?rev=988103&r1=988102&r2=988103&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java Mon Aug 23 12:45:21 2010
@@ -73,7 +73,7 @@ public class SampleJSELauncher extends R
* Using a Tuscany specific mechanism for getting at local service proxies
*/
public void launchBindingWSCalculator() throws NoSuchDomainException, NoSuchServiceException{
- Node node = startNode(new Contribution("c1", "../contribution-binding-ws-calculator/target/sample-contribution-binding-ws-calculator.jar"));
+ Node node = startNode(new Contribution("c1", "../binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
Modified: tuscany/sca-java-2.x/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/pom.xml?rev=988103&r1=988102&r2=988103&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/pom.xml Mon Aug 23 12:45:21 2010
@@ -49,9 +49,7 @@
********* -->
<module>helloworld-bpel</module>
- <module>helloworld-spring</module>
- <module>store</module>
- <module>store-webapp</module>
+ <module>helloworld-spring</module>
<module>webapps/helloworld</module>
<module>webapps/helloworld-bpel</module>
<module>webapps/helloworld-jaxrs</module>
@@ -66,9 +64,9 @@
<module>binding-rmi</module>
<module>binding-sca</module>
- <module>contribution-binding-ws-calculator</module>
+ <module>binding-ws</module>
<module>binding-jsonrpc</module>
- <module>contribution-implementation-java-calculator</module>
+ <module>implementation-java</module>
<module>implementation-script</module>
<!-- contributions - Tuscany samples -->
@@ -80,6 +78,7 @@
<!-- don't need to process these as they just contain README files
<module>launcher-command-line</module>
<module>launcher-maven</module>
+ <module>launcher-webapp</module>
-->
<module>launcher-embedded-jse</module>
<module>launcher-embedded-osgi</module>
@@ -87,7 +86,8 @@
<!-- Application samples -->
- <!-- TODO -->
+ <module>store</module>
+ <module>store-webapp</module>
</modules>