TUSCANY-3438 - Adding calculator-corba samples to 1.6 binary distribution

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@902486 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 239 insertions, 35 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6/distribution/bundle/pom.xml b/sca-java-1.x/branches/sca-java-1.6/distribution/bundle/pom.xml
index e135ecd21b..c11bc2bd68 100644
--- a/sca-java-1.x/branches/sca-java-1.6/distribution/bundle/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6/distribution/bundle/pom.xml
@@ -309,6 +309,11 @@
             <version>${pom.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-corba-jse-tns</artifactId>
+            <version>${pom.version}</version>
+        </dependency>        
+        <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
             <version>${pom.version}</version>
diff --git a/sca-java-1.x/branches/sca-java-1.6/distribution/manifest/pom.xml b/sca-java-1.x/branches/sca-java-1.6/distribution/manifest/pom.xml
index a774510fe6..e392751acc 100644
--- a/sca-java-1.x/branches/sca-java-1.6/distribution/manifest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6/distribution/manifest/pom.xml
@@ -72,6 +72,16 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-binding-corba</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-binding-corba-runtime</artifactId>
+            <version>${pom.version}</version>
+        </dependency>        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-binding-rss</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -356,6 +366,11 @@
             <version>${pom.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-corba-jse-tns</artifactId>
+            <version>${pom.version}</version>
+        </dependency>        
+        <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
             <version>${pom.version}</version>
diff --git a/sca-java-1.x/branches/sca-java-1.6/distribution/src/main/assembly/bin.xml b/sca-java-1.x/branches/sca-java-1.6/distribution/src/main/assembly/bin.xml
index f3c185b5ab..fc64762716 100644
--- a/sca-java-1.x/branches/sca-java-1.6/distribution/src/main/assembly/bin.xml
+++ b/sca-java-1.x/branches/sca-java-1.6/distribution/src/main/assembly/bin.xml
@@ -177,10 +177,6 @@
                 <!-- Modules excluded from distribution as work is in progress... -->
                 <exclude>calculator2</exclude>
                 <exclude>calculator2/**/*</exclude>
-                <exclude>calculator-corba-reference</exclude>
-                <exclude>calculator-corba-reference/**/*</exclude>
-                <exclude>calculator-corba-service</exclude>
-                <exclude>calculator-corba-service/**/*</exclude>
                 <exclude>calculator-lean</exclude>
                 <exclude>calculator-lean/**/*</exclude>
                 <exclude>calculator-osgi</exclude>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-reference/build.xml b/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-reference/build.xml
new file mode 100644
index 0000000000..066bb289ea
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-reference/build.xml
@@ -0,0 +1,72 @@
+<!--
+ * 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 name="calculator-corba-reference" default="compile">
+    <property name="test.class" value="calculator.CalculatorClient" />
+	<property name="test.jar"   value="sample-calculator-corba-reference.jar" />
+	
+    <target name="init">
+        <mkdir dir="target/classes"/>
+    </target>
+	
+    <target name="compile" depends="init">
+        <javac srcdir="src/main/java"
+               destdir="target/classes"
+               debug="on"
+               source="1.5"
+               target="1.5">
+            <classpath>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </javac> 
+        <copy todir="target/classes">
+            <fileset dir="src/main/resources"/>
+        </copy>
+        <jar destfile="target/${test.jar}" basedir="target/classes">
+            <manifest>
+                <attribute name="Main-Class" value="${test.class}" /> 
+            </manifest>
+        </jar>    	
+    </target>	
+	
+    <target name="run-classes">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+                <pathelement path="target/classes"/>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>
+    </target>
+	
+    <target name="run">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+                <pathelement path="target/${test.jar}"/>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>    	
+    </target>
+	
+    <target name="clean">
+        <delete quiet="true" includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-service/build.xml b/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-service/build.xml
new file mode 100644
index 0000000000..9720cef593
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-service/build.xml
@@ -0,0 +1,72 @@
+<!--
+ * 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 name="calculator-corba-service" default="compile">
+    <property name="test.class" value="calculator.CalculatorCORBAServer" />
+	<property name="test.jar"   value="sample-calculator-corba-service.jar" />
+	
+    <target name="init">
+        <mkdir dir="target/classes"/>
+    </target>
+	
+    <target name="compile" depends="init">
+        <javac srcdir="src/main/java"
+               destdir="target/classes"
+               debug="on"
+               source="1.5"
+               target="1.5">
+            <classpath>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </javac> 
+        <copy todir="target/classes">
+            <fileset dir="src/main/resources"/>
+        </copy>
+        <jar destfile="target/${test.jar}" basedir="target/classes">
+            <manifest>
+                <attribute name="Main-Class" value="${test.class}" /> 
+            </manifest>
+        </jar>    	
+    </target>	
+	
+    <target name="run-classes">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+                <pathelement path="target/classes"/>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>
+    </target>
+	
+    <target name="run">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+                <pathelement path="target/${test.jar}"/>
+            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
+            </classpath>
+        </java>    	
+    </target>
+	
+    <target name="clean">
+        <delete quiet="true" includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-service/pom.xml b/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-service/pom.xml
index 466a8004a5..54839fe626 100644
--- a/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-service/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-service/pom.xml
@@ -35,37 +35,37 @@
        </repository>

     </repositories>

 

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-embedded</artifactId>

-            <version>1.6-SNAPSHOT</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-corba-runtime</artifactId>

-            <version>1.6-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-	<dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-corba-jse-tns</artifactId>

-            <version>1.6-SNAPSHOT</version>

-            <scope>runtime</scope>

-        </dependency>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

+	<dependencies>

+		<dependency>

+			<groupId>org.apache.tuscany.sca</groupId>

+			<artifactId>tuscany-host-embedded</artifactId>

+			<version>1.6-SNAPSHOT</version>

+		</dependency>

+		<dependency>

+			<groupId>org.apache.tuscany.sca</groupId>

+			<artifactId>tuscany-implementation-java-runtime</artifactId>

+			<version>1.6-SNAPSHOT</version>

+			<scope>runtime</scope>

+		</dependency>

+		<dependency>

+			<groupId>org.apache.tuscany.sca</groupId>

+			<artifactId>tuscany-binding-corba-runtime</artifactId>

+			<version>1.6-SNAPSHOT</version>

+			<scope>runtime</scope>

+		</dependency>

+		<dependency>

+			<groupId>org.apache.tuscany.sca</groupId>

+			<artifactId>tuscany-host-corba-jse-tns</artifactId>

+			<version>1.6-SNAPSHOT</version>

+			<scope>runtime</scope>

+		</dependency>

+		<dependency>

+			<groupId>junit</groupId>

+			<artifactId>junit</artifactId>

+			<version>4.5</version>

+			<scope>test</scope>

+		</dependency>

+	</dependencies>

 

     <build>

        <finalName>${artifactId}</finalName>

diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-service/src/main/java/calculator/CalculatorCORBAServer.java b/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-service/src/main/java/calculator/CalculatorCORBAServer.java
new file mode 100644
index 0000000000..aa6154e25a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6/samples/calculator-corba-service/src/main/java/calculator/CalculatorCORBAServer.java
@@ -0,0 +1,44 @@
+/*
+ * 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.    
+ */
+
+package calculator;
+
+import java.io.IOException;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public class CalculatorCORBAServer {
+
+    public static void main(String[] args) {
+        SCADomain scaDomain;
+        try {
+            scaDomain = SCADomain.newInstance("CalculatorCORBAServer.composite");
+
+            System.out.println("Calculator CORBA server started (press enter to shutdown)");
+            System.in.read();
+            scaDomain.close();
+            System.out.println("Calculator CORBA server stopped");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+       
+    }
+
+}