From 2e53441d0777a179cde24288451555fdf0b70e23 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 4 Feb 2010 08:24:53 +0000
Subject: Launch JMS broker and CORBA tnameserv automatically (TUSCANY-3454)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@906398 13f79535-47bb-0310-9956-ffa450edef68
---
 .../travelsample/services/smsgateway-jms/build.xml | 12 -------
 .../src/main/java/scatours/JMSBrokerLauncher.java  | 38 ----------------------
 .../smsgateway/SMSGatewayJMSServiceBootstrap.java  |  7 ++++
 3 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/JMSBrokerLauncher.java

(limited to 'sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms')

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/build.xml
index fe7e66111e..389f6296c3 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/build.xml
@@ -20,18 +20,6 @@
 <project name="scatours-service-smsgateway-jms" default="compile">
     <import file="../../antdefs.xml"/>
 
-    <!-- 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="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>
-
     <!-- 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. -->
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/JMSBrokerLauncher.java b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/JMSBrokerLauncher.java
deleted file mode 100644
index 929eb78431..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/JMSBrokerLauncher.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java
index b4effa6f82..d8543266e3 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java
+++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java
@@ -22,10 +22,17 @@ import javax.jms.Connection;
 import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
 
 public class SMSGatewayJMSServiceBootstrap {
 
     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("Publishing SMS Gateway Service as a JMS service: tcp://localhost:61619");
         System.out.println("Press Ctrl^C to terminate...");
 
-- 
cgit v1.2.3