Updated CORBA server code to use the new POA style of CORBA service

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@777435 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 14 insertions, 6 deletions

diff --git a/sandbox/travelsample/services/smsgateway-corba-service/pom.xml b/sandbox/travelsample/services/smsgateway-corba-service/pom.xml
index 99885194d8..a46c0fd294 100644
--- a/sandbox/travelsample/services/smsgateway-corba-service/pom.xml
+++ b/sandbox/travelsample/services/smsgateway-corba-service/pom.xml
@@ -58,8 +58,9 @@
                             <includes>

                                 <include>sms-gateway.idl</include>

                             </includes>

-                            <emitStubs>false</emitStubs>

+                            <emitStubs>true</emitStubs>

                             <emitSkeletons>true</emitSkeletons>

+                            <compatible>false</compatible>
                         </source>

                     </sources>

                     <sourceDirectory>${basedir}/src/main/resources</sourceDirectory>

diff --git a/sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java b/sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java
index fbe06f71ee..8e027e51b7 100644
--- a/sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java
+++ b/sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java
@@ -19,9 +19,12 @@
 package scatours.smsgateway;

 

 import org.omg.CORBA.ORB;

+import org.omg.CORBA.Object;

 import org.omg.CosNaming.NameComponent;

 import org.omg.CosNaming.NamingContextExt;

 import org.omg.CosNaming.NamingContextExtHelper;

+import org.omg.PortableServer.POA;

+import org.omg.PortableServer.POAHelper;

 

 public class SMSGatewayCORBAServiceBootstrap {

 

@@ -34,7 +37,7 @@ public class SMSGatewayCORBAServiceBootstrap {
         NamingContextExt namingCtx;

         try

         {

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

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

           namingCtx = NamingContextExtHelper.narrow(objRef);

         } catch (Exception ex) {

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

@@ -43,12 +46,16 @@ public class SMSGatewayCORBAServiceBootstrap {
           return;

         }

 

-        SMSGatewayServiceImpl smsGateway = new SMSGatewayServiceImpl();

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

+        POA rootPoa = POAHelper.narrow(rootPoaRef);

+        rootPoa.the_POAManager().activate();

+        

+        SMSGatewayServant smsGateway = new SMSGatewayServant();

 

         String corbaServerName = "SMSGatewayCORBAService";

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

-

-        namingCtx.rebind(name, smsGateway);

+        Object smsGatewayRef = rootPoa.servant_to_reference(smsGateway);

+        namingCtx.rebind(name, smsGatewayRef);

 

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

         orb.run();

diff --git a/sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayServiceImpl.java b/sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayServant.java
index 5e79686d34..5e43b671a0 100644
--- a/sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayServiceImpl.java
+++ b/sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayServant.java
@@ -19,7 +19,7 @@
 package scatours.smsgateway;

 

 

-public class SMSGatewayServiceImpl extends _SMSGatewayImplBase {

+public class SMSGatewayServant extends SMSGatewayPOA {

 

     public boolean sendSMS(String fromNumber, String toNumber, String text) {

         System.out.println("Sending SMS message");