Add/fix ant scripts for contents of travel sample services and launchers directories (TUSCANY-3398)

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

17 files changed, 151 insertions, 134 deletions

diff --git a/sandbox/travelsample/services/build.xml b/sandbox/travelsample/services/build.xml
new file mode 100644
index 0000000000..21b282707c
--- /dev/null
+++ b/sandbox/travelsample/services/build.xml
@@ -0,0 +1,49 @@
+<!--

+ * 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="scatours-services" default="compile">

+

+    <target name="compile">

+        <antcall target="allsubdirs">

+            <param name="target" value="compile"/>

+        </antcall>

+    </target>

+

+    <target name="test">

+        <antcall target="allsubdirs">

+            <param name="target" value="test"/>

+        </antcall>

+    </target>

+

+    <target name="clean">

+        <antcall target="allsubdirs">

+            <param name="target" value="clean"/>

+        </antcall>

+    </target>

+

+    <target name="allsubdirs">

+        <ant dir="creditcard-payment-jaxws" target="${target}"/>

+        <ant dir="smsgateway-corba" target="${target}"/>

+        <ant dir="smsgateway-ejb" target="${target}"/>

+        <ant dir="smsgateway-jaxws" target="${target}"/>

+        <ant dir="smsgateway-jms" target="${target}"/>

+        <ant dir="smsgateway-rmi" target="${target}"/>

+    </target>

+

+</project>

diff --git a/sandbox/travelsample/services/creditcard-payment-jaxws/build.xml b/sandbox/travelsample/services/creditcard-payment-jaxws/build.xml
index 086f13825c..515df819c3 100644
--- a/sandbox/travelsample/services/creditcard-payment-jaxws/build.xml
+++ b/sandbox/travelsample/services/creditcard-payment-jaxws/build.xml
@@ -18,31 +18,14 @@
 -->

 

 <project name="scatours-service-creditcard-payment-jaxws" default="compile">

-    <property environment="env"/> 

-

-    <target name="compile">

-        <mkdir dir="target/classes"/>

-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

-            <src path="src/main/java"/>

-            <classpath>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac>

-    </target>

+    <import file="../../antdefs.xml"/>

 

+    <!-- The "run" target starts a JAX-WS service endpoint for a simple

+       credit card payment service.  This endpoint does not appear to be

+       used currently anywhere else in the travel application. -->

     <target name="run">

-        <java classname="creditcard.CreditCardServiceBootstrap" fork="true">

-            <classpath>

-                <pathelement location="target/classes"/>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

+        <java classname="scatours.creditcard.CreditCardServiceBootstrap" fork="true">

+            <classpath location="target/${ant.project.name}.jar"/>

         </java>

     </target>

-

-    <target name="clean">

-        <delete includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-

 </project>

diff --git a/sandbox/travelsample/services/pom.xml b/sandbox/travelsample/services/pom.xml
index f625fe5e8e..0c8812cffd 100644
--- a/sandbox/travelsample/services/pom.xml
+++ b/sandbox/travelsample/services/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>

     <parent>

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

-        <artifactId>tuscany-scatours</artifactId>

+        <artifactId>scatours</artifactId>

         <version>1.0-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

diff --git a/sandbox/travelsample/services/smsgateway-corba/build.xml b/sandbox/travelsample/services/smsgateway-corba/build.xml
index ae2939131c..b56445a129 100644
--- a/sandbox/travelsample/services/smsgateway-corba/build.xml
+++ b/sandbox/travelsample/services/smsgateway-corba/build.xml
@@ -18,31 +18,27 @@
 -->

 

 <project name="scatours-service-smsgateway-corba" default="compile">

-    <property environment="env"/> 

+    <import file="../../antdefs.xml"/>

 

-    <target name="compile">

-        <mkdir dir="target/classes"/>

-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

-            <src path="src/main/java"/>

-            <classpath>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac>

+    <target name="idljava">

+        <antcall target="idlj">

+            <param name="idlfile" value="sms-gateway.idl"/>

+            <param name="javaclass" value="scatours/smsgateway/SMSGatewayPOA.class"/>

+        </antcall>

     </target>

 

-    <target name="run">

-        <java classname="scatours.smsgateway.SMSGatewayCORBAServiceBootstrap" fork="true">

-            <classpath>

-                <pathelement location="target/classes"/>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

+    <!-- Before invoking the "run" target, the CORBA nameserver needs to be

+         started and running in a different process. -->

+    <target name="run-nameserver">

+        <exec executable="${env.JAVA_HOME}/bin/tnameserv">

+            <arg value="-ORBInitialPort"/>

+            <arg value="5080"/>

+        </exec>

     </target>

 

-    <target name="clean">

-        <delete includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

+    <target name="run">

+        <java classname="scatours.smsgateway.SMSGatewayCORBAServiceBootstrap" fork="true">

+            <classpath location="target/${ant.project.name}.jar"/>

+       </java>

     </target>

-

 </project>

diff --git a/sandbox/travelsample/services/smsgateway-ejb/build.xml b/sandbox/travelsample/services/smsgateway-ejb/build.xml
index 36630cedee..cd08a865dc 100644
--- a/sandbox/travelsample/services/smsgateway-ejb/build.xml
+++ b/sandbox/travelsample/services/smsgateway-ejb/build.xml
@@ -18,31 +18,17 @@
 -->

 

 <project name="scatours-service-smsgateway-ejb" default="compile">

-    <property environment="env"/> 

-

-    <target name="compile">

-        <mkdir dir="target/classes"/>

-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

-            <src path="src/main/java"/>

-            <classpath>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac>

-    </target>

+    <import file="../../antdefs.xml"/>

 

+    <!-- The "run" target starts an OpenEJB service endpoint for the

+       SMS gateway service.  This endpoint is used by the "run" target

+       of the notification-ejb launcher. -->

     <target name="run">

-        <java classname="scatours.smsgateway.SMSGatewayEJBServiceBootstrap" fork="true">

+        <java classname="com.tuscanyscatours.smsgateway.SMSGatewayEJBServiceBootstrap" fork="true">

             <classpath>

-                <pathelement location="target/classes"/>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

+                <pathelement location="target/${ant.project.name}.jar"/>

+                <fileset dir="${env.OPENEJB_HOME}/lib"/>

             </classpath>

         </java>

     </target>

-

-    <target name="clean">

-        <delete includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-

 </project>

diff --git a/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGateway.java b/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
index 70f1191596..b462dd1be8 100644
--- a/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGateway.java
+++ b/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.smsgateway;
+package com.tuscanyscatours.smsgateway;
 
 import javax.ejb.Remote;
 
diff --git a/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGatewayEJBServiceBootstrap.java b/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayEJBServiceBootstrap.java
index 5c1a61f4dc..4da784bc55 100644
--- a/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGatewayEJBServiceBootstrap.java
+++ b/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayEJBServiceBootstrap.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations

  * under the License.

  */

-package scatours.smsgateway;

+package com.tuscanyscatours.smsgateway;

 

 import java.util.Properties;

 

diff --git a/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGatewayImpl.java b/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java
index 5ce94bf3a2..3bdf48a7ea 100644
--- a/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGatewayImpl.java
+++ b/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations

  * under the License.

  */

-package scatours.smsgateway;

+package com.tuscanyscatours.smsgateway;

 

 import javax.ejb.Stateless;

 

diff --git a/sandbox/travelsample/services/smsgateway-jaxws/build.xml b/sandbox/travelsample/services/smsgateway-jaxws/build.xml
index 1cb7f3c930..be9830cc1b 100644
--- a/sandbox/travelsample/services/smsgateway-jaxws/build.xml
+++ b/sandbox/travelsample/services/smsgateway-jaxws/build.xml
@@ -18,31 +18,14 @@
 -->

 

 <project name="scatours-service-smsgateway-jaxws" default="compile">

-    <property environment="env"/> 

-

-    <target name="compile">

-        <mkdir dir="target/classes"/>

-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

-            <src path="src/main/java"/>

-            <classpath>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac>

-    </target>

+    <import file="../../antdefs.xml"/>

 

+    <!-- The "run" target starts a JAX-WS service endpoint for the

+       SMS gateway service.  This endpoint is used by the "run" target

+       of the notification-ws launcher. -->

     <target name="run">

         <java classname="com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap" fork="true">

-            <classpath>

-                <pathelement location="target/classes"/>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

+            <classpath location="target/${ant.project.name}.jar"/>

         </java>

     </target>

-

-    <target name="clean">

-        <delete includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-

 </project>

diff --git a/sandbox/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceBootstrap.java b/sandbox/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceBootstrap.java
index e63f248c1e..6631aee907 100644
--- a/sandbox/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceBootstrap.java
+++ b/sandbox/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceBootstrap.java
@@ -23,7 +23,7 @@ import javax.xml.ws.Endpoint;
 public class SMSGatewayServiceBootstrap {

 

     public static void main(String[] args) {

-        System.out.println("Publishing SMS Gateway Service as web service: http://localhost:8081/CreditCardService");

+        System.out.println("Publishing SMS Gateway Service as web service: http://localhost:8081/SMSGatewayService");

         System.out.println("Press Ctrl^C to terminate...");

 

         Endpoint.publish("http://localhost:8081/SMSGatewayService", new SMSGatewayServiceImpl());

diff --git a/sandbox/travelsample/services/smsgateway-jms/build.xml b/sandbox/travelsample/services/smsgateway-jms/build.xml
index 1bd42894db..fe7e66111e 100644
--- a/sandbox/travelsample/services/smsgateway-jms/build.xml
+++ b/sandbox/travelsample/services/smsgateway-jms/build.xml
@@ -18,31 +18,30 @@
 -->

 

 <project name="scatours-service-smsgateway-jms" default="compile">

-    <property environment="env"/> 

+    <import file="../../antdefs.xml"/>

 

-    <target name="compile">

-        <mkdir dir="target/classes"/>

-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

-            <src path="src/main/java"/>

+    <!-- Before invoking the "run" target, the JMS broker needs to be

+         started and running in a different process. -->

+    <target name="run-broker">

+        <java classname="scatours.JMSBrokerLauncher" fork="true">

             <classpath>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

+                <pathelement location="target/${ant.project.name}.jar"/>

+                <!-- The following is used to bring in the ActiveMQ runtime. -->

+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

-        </javac>

+        </java>

     </target>

 

+    <!-- The "run" target creates JMS request and response queues for the

+       SMS gateway service.  These queues are used by the "run" target of

+       the notification-jms launcher. -->

     <target name="run">

         <java classname="scatours.smsgateway.SMSGatewayJMSServiceBootstrap" fork="true">

             <classpath>

-                <pathelement location="target/classes"/>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

+                <pathelement location="target/${ant.project.name}.jar"/>

+                <!-- The following is used to bring in the ActiveMQ runtime. -->

+                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

     </target>

-

-    <target name="clean">

-        <delete includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-

 </project>

diff --git a/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/JMSBrokerLauncher.java b/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/JMSBrokerLauncher.java
new file mode 100644
index 0000000000..929eb78431
--- /dev/null
+++ b/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/JMSBrokerLauncher.java
@@ -0,0 +1,38 @@
+/*
+ * 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 scatours;
+
+import org.apache.activemq.broker.BrokerService;
+
+public class JMSBrokerLauncher {
+
+    public static void main(String[] args) throws Exception {
+        final BrokerService jmsBroker = new BrokerService();
+        jmsBroker.setPersistent(false);
+        jmsBroker.setUseJmx(false);
+        jmsBroker.addConnector("tcp://localhost:61619");
+        jmsBroker.start();
+
+        System.out.println("JMS Message Broker started");
+        System.out.println("Press enter to shutdown.");
+        System.in.read();
+
+        jmsBroker.stop();
+    }
+}
diff --git a/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java b/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java
index d27635f0c3..b4effa6f82 100644
--- a/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java
+++ b/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java
@@ -27,6 +27,7 @@ public class SMSGatewayJMSServiceBootstrap {
 

     public static void main(String[] args) throws Exception {

         System.out.println("Publishing SMS Gateway Service as a JMS service: tcp://localhost:61619");

+        System.out.println("Press Ctrl^C to terminate...");

 

         ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61619");

         Connection connection = connectionFactory.createConnection();

diff --git a/sandbox/travelsample/services/smsgateway-rmi/build.xml b/sandbox/travelsample/services/smsgateway-rmi/build.xml
index 5a2e7d1aac..2b43ed15db 100644
--- a/sandbox/travelsample/services/smsgateway-rmi/build.xml
+++ b/sandbox/travelsample/services/smsgateway-rmi/build.xml
@@ -18,31 +18,13 @@
 -->

 

 <project name="scatours-service-smsgateway-rmi" default="compile">

-    <property environment="env"/> 

-

-    <target name="compile">

-        <mkdir dir="target/classes"/>

-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

-            <src path="src/main/java"/>

-            <classpath>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac>

-    </target>

+    <import file="../../antdefs.xml"/>

 

+    <!-- The "run" target starts an RMI server for the SMS gateway service.

+       This server is used by the "run" target of the notification-rmi launcher. -->

     <target name="run">

-        <java classname="scatours.smsgateway.SMSGatewayRMIServiceBootstrap" fork="true">

-            <classpath>

-                <pathelement location="target/classes"/>

-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

+        <java classname="com.tuscanyscatours.smsgateway.SMSGatewayRMIServiceBootstrap" fork="true">

+            <classpath location="target/${ant.project.name}.jar"/>

         </java>

     </target>

-

-    <target name="clean">

-        <delete includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-

 </project>

diff --git a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGateway.java b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
index e6e866fa1d..4ce528fd23 100644
--- a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGateway.java
+++ b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.smsgateway;
+package com.tuscanyscatours.smsgateway;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
diff --git a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayImpl.java b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java
index 0ac8cd4293..c33439af8b 100644
--- a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayImpl.java
+++ b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations

  * under the License.

  */

-package scatours.smsgateway;

+package com.tuscanyscatours.smsgateway;

 

 import java.rmi.RemoteException;

 import java.rmi.server.UnicastRemoteObject;

diff --git a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayRMIServiceBootstrap.java b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayRMIServiceBootstrap.java
index b13f3d2aee..5b223fb40c 100644
--- a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayRMIServiceBootstrap.java
+++ b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayRMIServiceBootstrap.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations

  * under the License.

  */

-package scatours.smsgateway;

+package com.tuscanyscatours.smsgateway;

 

 import java.rmi.registry.LocateRegistry;

 import java.rmi.registry.Registry;