You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/11/05 22:14:55 UTC

svn commit: r833174 [4/4] - in /tuscany/sandbox/travelsample: clients/currency-converter-corba/src/main/java/scatours/ clients/currency-converter-jms/src/main/java/scatours/ clients/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconve...

Modified: tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java Thu Nov  5 21:14:49 2009
@@ -23,16 +23,16 @@
 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();
+        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();
+        System.out.println("JMS Message Broker started");
+        System.out.println("Press enter to shutdown.");
+        System.in.read();
 
-      jmsBroker.stop();
+        jmsBroker.stop();
     }
-  }
+}

Modified: tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java Thu Nov  5 21:14:49 2009
@@ -31,20 +31,19 @@
 public class NotificationJMSLauncher {
 
     public static void main(String[] args) throws Exception {
-        SCAContribution notificationContribution = 
-          locate("notification");
-        SCAContribution notificationJMSContribution = 
-          locate("notification-jms");
+        SCAContribution notificationContribution = locate("notification");
+        SCAContribution notificationJMSContribution = locate("notification-jms");
 
-        SCANode node = SCANodeFactory.newInstance().createSCANode(
-            "notification-jms.composite", notificationContribution, notificationJMSContribution);
+        SCANode node =
+            SCANodeFactory.newInstance().createSCANode("notification-jms.composite",
+                                                       notificationContribution,
+                                                       notificationJMSContribution);
 
         try {
             node.start();
-    
+
             System.out.println("Quick notification test");
-            Notification notification = ((SCAClient)node).getService(
-                Notification.class, "Notification");
+            Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
             String accountID = "1234";
             String subject = "Holiday payment taken";
             String message = "Payment of £102.37 accepted...";

Modified: tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/notification/Notification.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/notification/Notification.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/notification/Notification.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/notification/Notification.java Thu Nov  5 21:14:49 2009
@@ -20,7 +20,7 @@
 package scatours.notification;
 
 public interface Notification {
-  
-  boolean notify(String accountID, String subject, String message);
+
+    boolean notify(String accountID, String subject, String message);
 
 }

Modified: tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java Thu Nov  5 21:14:49 2009
@@ -31,18 +31,17 @@
 public class NotificationRMILauncher {
 
     public static void main(String[] args) throws Exception {
-        SCAContribution notificationContribution = 
-          locate("notification");
-        SCAContribution notificationRMIContribution = 
-          locate("notification-rmi");
+        SCAContribution notificationContribution = locate("notification");
+        SCAContribution notificationRMIContribution = locate("notification-rmi");
 
-        SCANode node = SCANodeFactory.newInstance().createSCANode(
-            "notification-rmi.composite", notificationContribution, notificationRMIContribution);
+        SCANode node =
+            SCANodeFactory.newInstance().createSCANode("notification-rmi.composite",
+                                                       notificationContribution,
+                                                       notificationRMIContribution);
         node.start();
 
         System.out.println("Quick notification test");
-        Notification notification = ((SCAClient)node).getService(
-            Notification.class, "Notification");
+        Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
         String accountID = "1234";
         String subject = "Holiday payment taken";
         String message = "Payment of £102.37 accepted...";

Modified: tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/notification/Notification.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/notification/Notification.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/notification/Notification.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/notification/Notification.java Thu Nov  5 21:14:49 2009
@@ -20,7 +20,7 @@
 package scatours.notification;
 
 public interface Notification {
-  
-  boolean notify(String accountID, String subject, String message);
+
+    boolean notify(String accountID, String subject, String message);
 
 }

Modified: tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java Thu Nov  5 21:14:49 2009
@@ -31,18 +31,17 @@
 public class NotificationWSLauncher {
 
     public static void main(String[] args) throws Exception {
-        SCAContribution notificationContribution = 
-          locate("notification");
-        SCAContribution notificationWSContribution = 
-          locate("notification-ws");
+        SCAContribution notificationContribution = locate("notification");
+        SCAContribution notificationWSContribution = locate("notification-ws");
 
-        SCANode node = SCANodeFactory.newInstance().createSCANode(
-            "notification-ws.composite", notificationContribution, notificationWSContribution);
+        SCANode node =
+            SCANodeFactory.newInstance().createSCANode("notification-ws.composite",
+                                                       notificationContribution,
+                                                       notificationWSContribution);
         node.start();
 
         System.out.println("Quick notification test");
-        Notification notification = ((SCAClient)node).getService(
-            Notification.class, "Notification");
+        Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
         String accountID = "1234";
         String subject = "Holiday payment taken";
         String message = "Payment of £102.37 accepted...";

Modified: tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/notification/Notification.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/notification/Notification.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/notification/Notification.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/notification/Notification.java Thu Nov  5 21:14:49 2009
@@ -20,7 +20,7 @@
 package scatours.notification;
 
 public interface Notification {
-  
-  boolean notify(String accountID, String subject, String message);
+
+    boolean notify(String accountID, String subject, String message);
 
 }

Modified: tuscany/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java (original)
+++ tuscany/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java Thu Nov  5 21:14:49 2009
@@ -28,20 +28,17 @@
 public class PolicyLauncher {
 
     public static void main(String[] args) throws Exception {
-        SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, 
-            locate("client"),
-            locate("payment"));
+        SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, locate("client"), locate("payment"));
 
         node1.start();
-        
-        SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, 
-                locate("creditcard"));
-        
+
+        SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, locate("creditcard"));
+
         node2.start();
-        
+
         Runnable client = ((SCAClient)node1).getService(Runnable.class, "TestClient/Runnable");
         client.run();
-        
+
         node1.stop();
         node2.stop();
     }

Modified: tuscany/sandbox/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardServiceImpl.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardServiceImpl.java (original)
+++ tuscany/sandbox/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardServiceImpl.java Thu Nov  5 21:14:49 2009
@@ -20,13 +20,12 @@
 
 import javax.jws.WebService;
 
-@WebService(endpointInterface 
-        = "scatours.creditcard.CreditCardService")
+@WebService(endpointInterface = "scatours.creditcard.CreditCardService")
 public class CreditCardServiceImpl implements CreditCardService {
 
     public String makePayment(String cardNumber, String name, double amount) {
         System.out.println("Payment request from " + name);
-        
+
         if (cardNumber != null && cardNumber.startsWith("1")) {
             return "AUTH_ID:" + System.currentTimeMillis();
         }

Modified: tuscany/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java Thu Nov  5 21:14:49 2009
@@ -30,30 +30,30 @@
 
     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 );
+        ORB orb = ORB.init(orbArgs, null);
 
         NamingContextExt namingCtx;
         try {
-          Object objRef = orb.resolve_initial_references("NameService");
-          namingCtx = NamingContextExtHelper.narrow(objRef);
+            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.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;
         }
 
         Object rootPoaRef = orb.resolve_initial_references("RootPOA");
         POA rootPoa = POAHelper.narrow(rootPoaRef);
         rootPoa.the_POAManager().activate();
-        
+
         SMSGatewayServant smsGateway = new SMSGatewayServant();
         Object smsGatewayRef = rootPoa.servant_to_reference(smsGateway);
 
         String corbaServerName = "SMSGatewayCORBAService";
-        NameComponent[]  name = { new NameComponent(corbaServerName, "") };
+        NameComponent[] name = {new NameComponent(corbaServerName, "")};
         namingCtx.rebind(name, smsGatewayRef);
 
         System.out.println("CORBA server running - waiting for requests");

Modified: tuscany/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayServant.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayServant.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayServant.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayServant.java Thu Nov  5 21:14:49 2009
@@ -18,7 +18,6 @@
  */
 package scatours.smsgateway;
 
-
 public class SMSGatewayServant extends SMSGatewayPOA {
 
     public boolean sendSMS(String fromNumber, String toNumber, String text) {

Modified: 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/scatours/smsgateway/SMSGatewayEJBServiceBootstrap.java?rev=833174&r1=833173&r2=833174&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/scatours/smsgateway/SMSGatewayEJBServiceBootstrap.java Thu Nov  5 21:14:49 2009
@@ -26,20 +26,20 @@
 public class SMSGatewayEJBServiceBootstrap {
 
     public static void main(String[] args) throws Exception {
-      System.out.println("Publishing SMS Gateway Service as an EJB service");
+        System.out.println("Publishing SMS Gateway Service as an EJB service");
 
-      Properties properties = new Properties();
-      properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
-      properties.setProperty("openejb.embedded.remotable", "true");
+        Properties properties = new Properties();
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
+        properties.setProperty("openejb.embedded.remotable", "true");
 
-      InitialContext initialContext = new InitialContext(properties);
+        InitialContext initialContext = new InitialContext(properties);
 
-//      Object object = initialContext.lookup("SMSGatewayImplRemote");
-//      SMSGateway smsGateway = (SMSGateway) object;
-//      smsGateway.sendSMS("From", "to", "Message");
+        //      Object object = initialContext.lookup("SMSGatewayImplRemote");
+        //      SMSGateway smsGateway = (SMSGateway) object;
+        //      smsGateway.sendSMS("From", "to", "Message");
 
-      System.out.println("EJB server running - waiting for requests");
-      System.out.println("Press enter to shutdown.");
-      System.in.read();
+        System.out.println("EJB server running - waiting for requests");
+        System.out.println("Press enter to shutdown.");
+        System.in.read();
     }
 }

Modified: tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGateway.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGateway.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGateway.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGateway.java Thu Nov  5 21:14:49 2009
@@ -22,7 +22,6 @@
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
-
 /**
  * A gateway to send SMS messages.
  */

Modified: tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayImpl.java?rev=833174&r1=833173&r2=833174&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayImpl.java (original)
+++ tuscany/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayImpl.java Thu Nov  5 21:14:49 2009
@@ -44,83 +44,83 @@
     private final MessageProducer producer;
 
     public SMSGatewayImpl(Session session) throws JMSException {
-      this.session = session;
-      Destination requestDest = session.createQueue("SMSRequestQueue");
-      consumer = session.createConsumer(requestDest);
+        this.session = session;
+        Destination requestDest = session.createQueue("SMSRequestQueue");
+        consumer = session.createConsumer(requestDest);
 
-      Destination responseDest = session.createQueue("SMSResponseQueue");
-      producer = session.createProducer(responseDest);
+        Destination responseDest = session.createQueue("SMSResponseQueue");
+        producer = session.createProducer(responseDest);
     }
 
     public void start() throws JMSException, XMLStreamException {
-      while (true) {
-        Message message = consumer.receive();
-        handleRequest(message);
-      }
+        while (true) {
+            Message message = consumer.receive();
+            handleRequest(message);
+        }
     }
 
     private void handleRequest(Message inMessage) throws XMLStreamException, JMSException {
-      OMElement xml = parseXMLPayload(inMessage);
+        OMElement xml = parseXMLPayload(inMessage);
 
-      String fromNumber = getStringArg(xml, 0);
-      String toNumber = getStringArg(xml, 1);
-      String text = getStringArg(xml, 2);
+        String fromNumber = getStringArg(xml, 0);
+        String toNumber = getStringArg(xml, 1);
+        String text = getStringArg(xml, 2);
 
-      boolean result = sendSMS(fromNumber, toNumber, text);
+        boolean result = sendSMS(fromNumber, toNumber, text);
 
-      String responseXML = createXMLResponse(result);
+        String responseXML = createXMLResponse(result);
 
-      TextMessage outMessage = createResponseMessage(inMessage.getJMSMessageID(), responseXML);
-      producer.send(outMessage);
+        TextMessage outMessage = createResponseMessage(inMessage.getJMSMessageID(), responseXML);
+        producer.send(outMessage);
     }
 
     private OMElement parseXMLPayload(Message inMessage) throws JMSException, XMLStreamException {
-      final byte[] msgData;
-      if (inMessage instanceof TextMessage) {
-          msgData = ((TextMessage) inMessage).getText().getBytes();
-      } else if (inMessage instanceof BytesMessage) {
-          BytesMessage bytesMessage = (BytesMessage) inMessage;
-          msgData = new byte[(int) bytesMessage.getBodyLength()];
-          bytesMessage.readBytes(msgData);
-      } else {
-          throw new JMSException("Unsupported JMS message type of " + inMessage.getClass().getName());
-      }
-      ByteArrayInputStream in = new ByteArrayInputStream(msgData);
-      StAXOMBuilder builder = new StAXOMBuilder(in);
-      OMElement doc = builder.getDocumentElement();
-      return doc;
+        final byte[] msgData;
+        if (inMessage instanceof TextMessage) {
+            msgData = ((TextMessage)inMessage).getText().getBytes();
+        } else if (inMessage instanceof BytesMessage) {
+            BytesMessage bytesMessage = (BytesMessage)inMessage;
+            msgData = new byte[(int)bytesMessage.getBodyLength()];
+            bytesMessage.readBytes(msgData);
+        } else {
+            throw new JMSException("Unsupported JMS message type of " + inMessage.getClass().getName());
+        }
+        ByteArrayInputStream in = new ByteArrayInputStream(msgData);
+        StAXOMBuilder builder = new StAXOMBuilder(in);
+        OMElement doc = builder.getDocumentElement();
+        return doc;
     }
 
     private String getStringArg(OMElement doc, int i) {
-      QName argQName = new QName("arg" + i);
-      OMElement arg = doc.getFirstChildWithName(argQName);
-      if (arg == null) {
-        return null;
-      }
-      return arg.getText();
+        QName argQName = new QName("arg" + i);
+        OMElement arg = doc.getFirstChildWithName(argQName);
+        if (arg == null) {
+            return null;
+        }
+        return arg.getText();
     }
 
     public boolean sendSMS(String fromNumber, String toNumber, String text) {
-      System.out.println("From: " + fromNumber);
-      System.out.println("To: " + toNumber);
-      System.out.println(text);
-      return true;
+        System.out.println("From: " + fromNumber);
+        System.out.println("To: " + toNumber);
+        System.out.println(text);
+        return true;
     }
 
     private String createXMLResponse(boolean result) {
-      OMFactory omFactory = OMAbstractFactory.getOMFactory();
-      OMElement response = omFactory.createOMElement("sendSMS", "http://smsgateway.scatours/", "ns2");
-      OMElement returnValue = omFactory.createOMElement("return", null);
-      OMText returnV = omFactory.createOMText(Boolean.toString(result));
-      returnValue.addChild(returnV);
-      response.addChild(returnValue);
-      return response.toString();
+        OMFactory omFactory = OMAbstractFactory.getOMFactory();
+        OMElement response = omFactory.createOMElement("sendSMS", "http://smsgateway.scatours/", "ns2");
+        OMElement returnValue = omFactory.createOMElement("return", null);
+        OMText returnV = omFactory.createOMText(Boolean.toString(result));
+        returnValue.addChild(returnV);
+        response.addChild(returnValue);
+        return response.toString();
     }
 
     private TextMessage createResponseMessage(String correlationID, String responseXML) throws JMSException {
-      TextMessage outMessage = session.createTextMessage("sendSMS");
-      outMessage.setText(responseXML);
-      outMessage.setJMSCorrelationID(correlationID);
-      return outMessage;
+        TextMessage outMessage = session.createTextMessage("sendSMS");
+        outMessage.setText(responseXML);
+        outMessage.setJMSCorrelationID(correlationID);
+        return outMessage;
     }
-  }
+}

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=833174&r1=833173&r2=833174&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 Thu Nov  5 21:14:49 2009
@@ -26,15 +26,14 @@
 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("Publishing SMS Gateway Service as a JMS service: tcp://localhost:61619");
 
-      ActiveMQConnectionFactory connectionFactory 
-          = new ActiveMQConnectionFactory("tcp://localhost:61619");
-      Connection connection = connectionFactory.createConnection();
-      connection.start();
-      Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61619");
+        Connection connection = connectionFactory.createConnection();
+        connection.start();
+        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-      SMSGatewayImpl impl = new SMSGatewayImpl(session);
-      impl.start();
+        SMSGatewayImpl impl = new SMSGatewayImpl(session);
+        impl.start();
     }
 }

Modified: 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/scatours/smsgateway/SMSGateway.java?rev=833174&r1=833173&r2=833174&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/scatours/smsgateway/SMSGateway.java Thu Nov  5 21:14:49 2009
@@ -22,7 +22,6 @@
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
-
 /**
  * A gateway to send SMS messages.
  */

Modified: 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/scatours/smsgateway/SMSGatewayRMIServiceBootstrap.java?rev=833174&r1=833173&r2=833174&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/scatours/smsgateway/SMSGatewayRMIServiceBootstrap.java Thu Nov  5 21:14:49 2009
@@ -24,17 +24,17 @@
 public class SMSGatewayRMIServiceBootstrap {
 
     public static void main(String[] args) throws Exception {
-      System.out.println("Publishing SMS Gateway Service as a RMI service");
+        System.out.println("Publishing SMS Gateway Service as a RMI service");
 
-      String serviceName = "SMSGatewayRMI";
-      SMSGatewayImpl smsGatewayImpl = new SMSGatewayImpl();
-      Registry rmiRegistry = LocateRegistry.createRegistry(8099);
-      rmiRegistry.bind(serviceName, smsGatewayImpl);
+        String serviceName = "SMSGatewayRMI";
+        SMSGatewayImpl smsGatewayImpl = new SMSGatewayImpl();
+        Registry rmiRegistry = LocateRegistry.createRegistry(8099);
+        rmiRegistry.bind(serviceName, smsGatewayImpl);
 
-      System.out.println("RMI server running - waiting for requests");
-      System.out.println("Press enter to shutdown.");
-      System.in.read();
-      rmiRegistry.unbind(serviceName);
-      System.exit(-1);
+        System.out.println("RMI server running - waiting for requests");
+        System.out.println("Press enter to shutdown.");
+        System.in.read();
+        rmiRegistry.unbind(serviceName);
+        System.exit(-1);
     }
 }