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

3 files changed, 8 insertions, 50 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml
index 470e28bbf9..9fa999e350 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml
@@ -23,18 +23,6 @@
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

 

-    <!-- 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>

-

     <!-- After starting the SCA JMS service by invoking the "run" target below,

        the ActiveMQ JMS implementation of the currency converter client should be

        run in another process using the "run-client" target. -->

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java
index 9de41eb478..6da4e7e162 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java
@@ -21,6 +21,7 @@ package scatours;
 

 import static scatours.launcher.LauncherUtil.locate;

 

+import org.apache.activemq.broker.BrokerService;

 import org.apache.tuscany.sca.node.SCAContribution;

 import org.apache.tuscany.sca.node.SCANode;

 import org.apache.tuscany.sca.node.SCANodeFactory;

@@ -28,6 +29,12 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 public class CurrencyConverterJMSLauncher {

 

     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();

+

         SCAContribution currencyJMSContribution = locate("currency-jms");

         SCAContribution currencyContribution = locate("currency");

 

@@ -41,5 +48,6 @@ public class CurrencyConverterJMSLauncher {
         System.in.read();

 

         node.stop();

+        jmsBroker.stop();

     }

 }

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/JMSBrokerLauncher.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/JMSBrokerLauncher.java
deleted file mode 100644
index 929eb78431..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-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();
-    }
-}