4 files changed, 8 insertions, 26 deletions
diff --git a/sandbox/travelsample/services/smsgateway-rmi/build.xml b/sandbox/travelsample/services/smsgateway-rmi/build.xml
index 5a2e7d1aac..2b43ed15db 100644
--- a/sandbox/travelsample/services/smsgateway-rmi/build.xml
+++ b/sandbox/travelsample/services/smsgateway-rmi/build.xml
@@ -18,31 +18,13 @@
 -->
 
 <project name="scatours-service-smsgateway-rmi" default="compile">
-    <property environment="env"/> 
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac>
-    </target>
+    <import file="../../antdefs.xml"/>
 
+    <!-- The "run" target starts an RMI server for the SMS gateway service.
+       This server is used by the "run" target of the notification-rmi launcher. -->
     <target name="run">
-        <java classname="scatours.smsgateway.SMSGatewayRMIServiceBootstrap" fork="true">
-            <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
+        <java classname="com.tuscanyscatours.smsgateway.SMSGatewayRMIServiceBootstrap" fork="true">
+            <classpath location="target/${ant.project.name}.jar"/>
         </java>
     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
 </project>
diff --git a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGateway.java b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
index e6e866fa1d..4ce528fd23 100644
--- a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGateway.java
+++ b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package scatours.smsgateway;
+package com.tuscanyscatours.smsgateway;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
diff --git a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayImpl.java b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java
index 0ac8cd4293..c33439af8b 100644
--- a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayImpl.java
+++ b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package scatours.smsgateway;
+package com.tuscanyscatours.smsgateway;
 
 import java.rmi.RemoteException;
 import java.rmi.server.UnicastRemoteObject;
diff --git a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayRMIServiceBootstrap.java b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayRMIServiceBootstrap.java
index b13f3d2aee..5b223fb40c 100644
--- a/sandbox/travelsample/services/smsgateway-rmi/src/main/java/scatours/smsgateway/SMSGatewayRMIServiceBootstrap.java
+++ b/sandbox/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayRMIServiceBootstrap.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package scatours.smsgateway;
+package com.tuscanyscatours.smsgateway;
 
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;