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

5 files changed, 73 insertions, 82 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/build.xml
index c0bd7e24a4..cfba0cea3d 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/build.xml
@@ -28,15 +28,6 @@
         </antcall>

     </target>

 

-    <!-- 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="run">

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

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

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java
index 3ea7f7de44..9a53303e88 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java
+++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java
@@ -18,6 +18,10 @@
  */

 package scatours.smsgateway;

 

+import java.io.BufferedReader;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+

 import org.omg.CORBA.ORB;

 import org.omg.CORBA.Object;

 import org.omg.CosNaming.NameComponent;

@@ -29,34 +33,73 @@ import org.omg.PortableServer.POAHelper;
 public class SMSGatewayCORBAServiceBootstrap {

 

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

-        System.out.println("Publishing SMS Gateway Service as a CORBA service: SMSGatewayCORBAService (port=5080)");

-

-        String[] orbArgs = {"-ORBInitialPort", "5080"};

-        ORB orb = ORB.init(orbArgs, null);

+        String home = System.getProperty("java.home");

+        String[] tnsCommand = {"" + home + "/bin/tnameserv", "-ORBInitialPort", "5080"};

+        Process tns = null;

 

-        NamingContextExt namingCtx;

         try {

-            Object objRef = orb.resolve_initial_references("NameService");

-            namingCtx = NamingContextExtHelper.narrow(objRef);

-        } catch (Exception ex) {

-            System.err.println("ERROR: Failed to resolve Name Service.");

-            System.err.println("Don't forget to run it with:");

-            System.err.println("  tnameserv -ORBInitialPort 5080");

-            return;

-        }

+            System.out.println("Starting transient name server process (port=5080)");

+

+            // Start tnameserv in a separate process

+            tns = Runtime.getRuntime().exec(tnsCommand);

+

+            // Wait for the tnameserv process to complete its startup, and

+            // display the output from the tnameserv process on the console

+            InputStream tnsOut = tns.getInputStream();

+            BufferedReader tnsOutReader = new BufferedReader(new InputStreamReader(tnsOut));

+            while (true) {

+                String line = tnsOutReader.readLine();

+                System.out.println("tnameserv: " + line);

+                if ("Ready.".equals(line)) {

+                    break;

+                }

+            }

+

+            System.out.println("Publishing SMS Gateway Service as a CORBA service: SMSGatewayCORBAService (port=5080)");

 

-        Object rootPoaRef = orb.resolve_initial_references("RootPOA");

-        POA rootPoa = POAHelper.narrow(rootPoaRef);

-        rootPoa.the_POAManager().activate();

+            String[] orbArgs = {"-ORBInitialPort", "5080"};

+            ORB orb = ORB.init(orbArgs, null);

 

-        SMSGatewayServant smsGateway = new SMSGatewayServant();

-        Object smsGatewayRef = rootPoa.servant_to_reference(smsGateway);

+            NamingContextExt namingCtx;

+            try {

+                Object objRef = orb.resolve_initial_references("NameService");

+                namingCtx = NamingContextExtHelper.narrow(objRef);

+            } catch (Exception ex) {

+                System.err.println("ERROR: Failed to resolve Name Service.");

+                //System.err.println("Don't forget to run it with:");

+                //System.err.println("  tnameserv -ORBInitialPort 5080");

+                return;

+            }

 

-        String corbaServerName = "SMSGatewayCORBAService";

-        NameComponent[] name = {new NameComponent(corbaServerName, "")};

-        namingCtx.rebind(name, smsGatewayRef);

+            Object rootPoaRef = orb.resolve_initial_references("RootPOA");

+            POA rootPoa = POAHelper.narrow(rootPoaRef);

+            rootPoa.the_POAManager().activate();

 

-        System.out.println("CORBA server running - waiting for requests");

-        orb.run();

+            SMSGatewayServant smsGateway = new SMSGatewayServant();

+            Object smsGatewayRef = rootPoa.servant_to_reference(smsGateway);

+

+            String corbaServerName = "SMSGatewayCORBAService";

+            NameComponent[] name = {new NameComponent(corbaServerName, "")};

+            namingCtx.rebind(name, smsGatewayRef);

+

+            System.out.println("CORBA server running - press Enter to shutdown");

+            System.in.read();

+

+            orb.shutdown(true);

+            orb.destroy();

+

+        } finally {

+            // Make sure that the tnameserv process gets destroyed and its

+            // listener port is released

+            if (tns != null) {

+                System.out.println("Destroying transient name server process");

+                try {

+                    tns.destroy();

+                    System.out.println("Transient name server process destroyed");

+                } catch (Exception e) {

+                    // ignore

+                }

+            }

+        }

     }

 }

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...");