Author: slaws
Date: Wed May 19 10:52:02 2010
New Revision: 946117
URL: http://svn.apache.org/viewvc?rev=946117&view=rev
Log:
Move binding-sca sample contributions into an extension specific sub-directory
Added:
tuscany/sca-java-2.x/trunk/samples/binding-sca/
tuscany/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/
- copied from r946078,
tuscany/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/
tuscany/sca-java-2.x/trunk/samples/binding-sca/pom.xml
Modified:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/components/bin-samples.xml
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml
tuscany/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/build.xml
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
tuscany/sca-java-2.x/trunk/samples/pom.xml
Modified:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/components/bin-samples.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/src/main/components/bin-samples.xml?rev=946117&r1=946116&r2=946117&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/distribution/all/src/main/components/bin-samples.xml
(original)
+++
tuscany/sca-java-2.x/trunk/distribution/all/src/main/components/bin-samples.xml
Wed May 19 10:52:02 2010
@@ -28,6 +28,7 @@
<include>contribution*/**/*</include>
<include>launcher*/**/*</include>
<include>binding-rmi/contribution*/**/*</include>
+ <include>binding-sca/contribution*/**/*</include>
<include>calculator-osgi/**/*</include>
<include>helloworld/**/*</include>
<include>helloworld-spring/**/*</include>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml?rev=946117&r1=946116&r2=946117&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml
Wed May 19 10:52:02 2010
@@ -33,7 +33,7 @@
<target name="run">
<ant antfile="build.xml"
- dir="${distro.root}/samples/implementation-java-calculator"/>
+ dir="${distro.root}/samples/binding-sca/contribution-calculator"/>
</target>
Modified:
tuscany/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/build.xml?rev=946117&r1=946078&r2=946117&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/build.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/binding-sca/contribution-calculator/build.xml
Wed May 19 10:52:02 2010
@@ -18,8 +18,8 @@
-->
<project name="calculator" default="compile">
- <property name="tuscany.home" value="../.."/>
- <property name="jar.name"
value="contribution-binding-sca-calculator.jar" />
+ <property name="tuscany.home" value="../../.."/>
+ <property name="jar.name"
value="sample-contribution-binding-sca-calculator.jar" />
<echo>${tuscany.home}</echo>
Added: tuscany/sca-java-2.x/trunk/samples/binding-sca/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-sca/pom.xml?rev=946117&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/binding-sca/pom.xml (added)
+++ tuscany/sca-java-2.x/trunk/samples/binding-sca/pom.xml Wed May 19 10:52:02
2010
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-sample-binding-sca</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany SCA Sample binding.sca</name>
+
+ <repositories>
+ <repository>
+ <id>apache.incubator</id>
+ <url>http://people.apache.org/repo/m2-incubating-repository</url>
+ </repository>
+ </repositories>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>contribution-calculator</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
Modified: tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml?rev=946117&r1=946116&r2=946117&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
(original)
+++ tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml Wed May
19 10:52:02 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="binding-ws-calculator" default="run">
+<project name="launcher-embedded-jse" default="run">
<property name="tuscany.home" value="../.."/>
<property name="jar.name" value="sample-launcher-embedded-jse.jar" />
<property name="main.class" value="launcher.SampleJSELauncher" />
Modified:
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java?rev=946117&r1=946116&r2=946117&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
(original)
+++
tuscany/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
Wed May 19 10:52:02 2010
@@ -62,7 +62,7 @@ public class SampleJSELauncher extends R
* that calls the CalculatorServiceComponent from an operation marked by
@Init.
*/
public void launchBindingSCACalculator(){
- Node node = startNode(new Contribution("c1",
"../contribution-binding-sca-calculator/target/sample-contribution-binding-sca-calculator.jar"));
+ Node node = startNode(new Contribution("c1",
"../binding-sca/contribution-calculator/target/sample-contribution-binding-sca-calculator.jar"));
stopNode(node);
}
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=946117&r1=946116&r2=946117&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/pom.xml Wed May 19 10:52:02 2010
@@ -73,9 +73,9 @@
<!-- contributions - SCA samples -->
- <module>contribution-binding-sca-calculator</module>
- <module>contribution-binding-ws-calculator</module>
<module>binding-rmi</module>
+ <module>binding-sca</module>
+ <module>contribution-binding-ws-calculator</module>
<module>contribution-implementation-java-calculator</module>
<!-- contributions - Tuscany samples -->
