You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/01/02 10:24:45 UTC
svn commit: r895152 [2/2] - in /tuscany/sandbox/travelsample: ./ clients/
contributions/ contributions/payment-bpel/ contributions/trip/
distribution/ launchers/ launchers/blog-feed/ launchers/common/
launchers/currency-converter-corba/ launchers/curre...
Modified: tuscany/sandbox/travelsample/services/smsgateway-ejb/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-ejb/build.xml?rev=895152&r1=895151&r2=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-ejb/build.xml (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-ejb/build.xml Sat Jan 2 09:24:41 2010
@@ -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>
Copied: tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java (from r892559, tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGateway.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java?p2=tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java&p1=tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGateway.java&r1=892559&r2=895152&rev=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGateway.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java Sat Jan 2 09:24:41 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package scatours.smsgateway;
+package com.tuscanyscatours.smsgateway;
import javax.ejb.Remote;
Copied: tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayEJBServiceBootstrap.java (from r892559, tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGatewayEJBServiceBootstrap.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayEJBServiceBootstrap.java?p2=tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayEJBServiceBootstrap.java&p1=tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGatewayEJBServiceBootstrap.java&r1=892559&r2=895152&rev=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGatewayEJBServiceBootstrap.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayEJBServiceBootstrap.java Sat Jan 2 09:24:41 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.smsgateway;
+package com.tuscanyscatours.smsgateway;
import java.util.Properties;
Copied: tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java (from r892559, tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGatewayImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java?p2=tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java&p1=tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGatewayImpl.java&r1=892559&r2=895152&rev=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/scatours/smsgateway/SMSGatewayImpl.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java Sat Jan 2 09:24:41 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.smsgateway;
+package com.tuscanyscatours.smsgateway;
import javax.ejb.Stateless;
Modified: tuscany/sandbox/travelsample/services/smsgateway-jaxws/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-jaxws/build.xml?rev=895152&r1=895151&r2=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-jaxws/build.xml (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-jaxws/build.xml Sat Jan 2 09:24:41 2010
@@ -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>
Modified: tuscany/sandbox/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceBootstrap.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceBootstrap.java?rev=895152&r1=895151&r2=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceBootstrap.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceBootstrap.java Sat Jan 2 09:24:41 2010
@@ -23,7 +23,7 @@
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());
Modified: tuscany/sandbox/travelsample/services/smsgateway-jms/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-jms/build.xml?rev=895152&r1=895151&r2=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-jms/build.xml (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-jms/build.xml Sat Jan 2 09:24:41 2010
@@ -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>
Modified: tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java?rev=895152&r1=895151&r2=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java Sat Jan 2 09:24:41 2010
@@ -27,6 +27,7 @@
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();
Modified: tuscany/sandbox/travelsample/services/smsgateway-rmi/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-rmi/build.xml?rev=895152&r1=895151&r2=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-rmi/build.xml (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-rmi/build.xml Sat Jan 2 09:24:41 2010
@@ -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>
Copied: tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java (from r892559, tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGateway.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java?p2=tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java&p1=tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGateway.java&r1=892559&r2=895152&rev=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGateway.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java Sat Jan 2 09:24:41 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package scatours.smsgateway;
+package com.tuscanyscatours.smsgateway;
import java.rmi.Remote;
import java.rmi.RemoteException;
Copied: tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java (from r892559, tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java?p2=tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java&p1=tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayImpl.java&r1=892559&r2=895152&rev=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayImpl.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java Sat Jan 2 09:24:41 2010
@@ -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;
Copied: tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayRMIServiceBootstrap.java (from r892559, tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayRMIServiceBootstrap.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayRMIServiceBootstrap.java?p2=tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayRMIServiceBootstrap.java&p1=tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayRMIServiceBootstrap.java&r1=892559&r2=895152&rev=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayRMIServiceBootstrap.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayRMIServiceBootstrap.java Sat Jan 2 09:24:41 2010
@@ -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;
Modified: tuscany/sandbox/travelsample/testdomain/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/testdomain/build.xml?rev=895152&r1=895151&r2=895152&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/testdomain/build.xml (original)
+++ tuscany/sandbox/travelsample/testdomain/build.xml Sat Jan 2 09:24:41 2010
@@ -23,7 +23,9 @@
<target name="run">
<java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher" fork="true">
<classpath>
- <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ <fileset dir="${env.TUSCANY_HOME}/modules">
+ <include name="tuscany-node-launcher-*.jar"/>
+ </fileset>
</classpath>
</java>
</target>