From 6c468e5fcb04e4125addda6a9298526dad9e0b45 Mon Sep 17 00:00:00 2001 From: mcombellack Date: Fri, 22 May 2009 08:53:35 +0000 Subject: 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 --- .../services/smsgateway-corba-service/pom.xml | 3 ++- .../SMSGatewayCORBAServiceBootstrap.java | 15 ++++++++--- .../scatours/smsgateway/SMSGatewayServant.java | 31 ++++++++++++++++++++++ .../scatours/smsgateway/SMSGatewayServiceImpl.java | 31 ---------------------- 4 files changed, 44 insertions(+), 36 deletions(-) create mode 100644 sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayServant.java delete mode 100644 sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayServiceImpl.java (limited to 'sandbox/travelsample/services') 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 @@ sms-gateway.idl - false + true true + false ${basedir}/src/main/resources 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/SMSGatewayServant.java b/sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayServant.java new file mode 100644 index 0000000000..5e43b671a0 --- /dev/null +++ b/sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayServant.java @@ -0,0 +1,31 @@ +/* + * 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.smsgateway; + + +public class SMSGatewayServant extends SMSGatewayPOA { + + public boolean sendSMS(String fromNumber, String toNumber, String text) { + System.out.println("Sending SMS message"); + System.out.println("From: " + fromNumber); + System.out.println("To: " + toNumber); + System.out.println("Message: " + text); + return true; + } +} 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/SMSGatewayServiceImpl.java deleted file mode 100644 index 5e79686d34..0000000000 --- a/sandbox/travelsample/services/smsgateway-corba-service/src/main/java/scatours/smsgateway/SMSGatewayServiceImpl.java +++ /dev/null @@ -1,31 +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.smsgateway; - - -public class SMSGatewayServiceImpl extends _SMSGatewayImplBase { - - public boolean sendSMS(String fromNumber, String toNumber, String text) { - System.out.println("Sending SMS message"); - System.out.println("From: " + fromNumber); - System.out.println("To: " + toNumber); - System.out.println("Message: " + text); - return true; - } -} -- cgit v1.2.3