You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2009/09/16 00:40:39 UTC
svn commit: r815533 - in /tuscany/sandbox/travelsample/launchers: ./
notification-corba-launcher/ notification-corba/
notification-corba/src/main/java/scatours/ notification-ejb-launcher/
notification-ejb/ notification-ejb/src/main/java/scatours/ notif...
Author: nash
Date: Tue Sep 15 22:40:38 2009
New Revision: 815533
URL: http://svn.apache.org/viewvc?rev=815533&view=rev
Log:
Apply new naming convention to notification-* launchers
Added:
tuscany/sandbox/travelsample/launchers/notification-corba/
- copied from r815384, tuscany/sandbox/travelsample/launchers/notification-corba-launcher/
tuscany/sandbox/travelsample/launchers/notification-corba/build.xml
tuscany/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java
- copied, changed from r815384, tuscany/sandbox/travelsample/launchers/notification-corba-launcher/src/main/java/scatours/LaunchNotificationCORBANode.java
tuscany/sandbox/travelsample/launchers/notification-ejb/
- copied from r815384, tuscany/sandbox/travelsample/launchers/notification-ejb-launcher/
tuscany/sandbox/travelsample/launchers/notification-ejb/build.xml
tuscany/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java
- copied, changed from r815384, tuscany/sandbox/travelsample/launchers/notification-ejb-launcher/src/main/java/scatours/LaunchNotificationEJBNode.java
tuscany/sandbox/travelsample/launchers/notification-jms/
- copied from r815384, tuscany/sandbox/travelsample/launchers/notification-jms-launcher/
tuscany/sandbox/travelsample/launchers/notification-jms/build.xml
tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java
- copied, changed from r815384, tuscany/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java
tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java
- copied, changed from r815384, tuscany/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchNotificationJMSNode.java
tuscany/sandbox/travelsample/launchers/notification-rmi/
- copied from r815384, tuscany/sandbox/travelsample/launchers/notification-rmi-launcher/
tuscany/sandbox/travelsample/launchers/notification-rmi/build.xml
tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
- copied, changed from r815384, tuscany/sandbox/travelsample/launchers/notification-rmi-launcher/src/main/java/scatours/LaunchNotificationRMINode.java
tuscany/sandbox/travelsample/launchers/notification-ws/
- copied from r815384, tuscany/sandbox/travelsample/launchers/notification-ws-launcher/
tuscany/sandbox/travelsample/launchers/notification-ws/build.xml
tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java
- copied, changed from r815384, tuscany/sandbox/travelsample/launchers/notification-ws-launcher/src/main/java/scatours/LaunchNotificationWSNode.java
Removed:
tuscany/sandbox/travelsample/launchers/notification-corba-launcher/
tuscany/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/LaunchNotificationCORBANode.java
tuscany/sandbox/travelsample/launchers/notification-ejb-launcher/
tuscany/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/LaunchNotificationEJBNode.java
tuscany/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/smsgateway/
tuscany/sandbox/travelsample/launchers/notification-jms-launcher/
tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/LaunchJMSBroker.java
tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/LaunchNotificationJMSNode.java
tuscany/sandbox/travelsample/launchers/notification-rmi-launcher/
tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/LaunchNotificationRMINode.java
tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/smsgateway/
tuscany/sandbox/travelsample/launchers/notification-ws-launcher/
tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/LaunchNotificationWSNode.java
tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/smsgateway/
Modified:
tuscany/sandbox/travelsample/launchers/notification-corba/pom.xml
tuscany/sandbox/travelsample/launchers/notification-ejb/pom.xml
tuscany/sandbox/travelsample/launchers/notification-jms/pom.xml
tuscany/sandbox/travelsample/launchers/notification-rmi/pom.xml
tuscany/sandbox/travelsample/launchers/notification-ws/pom.xml
tuscany/sandbox/travelsample/launchers/pom.xml
Added: tuscany/sandbox/travelsample/launchers/notification-corba/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-corba/build.xml?rev=815533&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-corba/build.xml (added)
+++ tuscany/sandbox/travelsample/launchers/notification-corba/build.xml Tue Sep 15 22:40:38 2009
@@ -0,0 +1,56 @@
+<!--
+ * 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.
+-->
+
+<project name="scatours-launcher-notification-corba" 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>
+
+ <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.NotificationCORBALauncher" fork="true">
+ <classpath>
+ <pathelement location="target/classes"/>
+ <pathelement location="${env.TUSCANY_HOST_CORBA}/tuscany-host-corba-jse.jar"/>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="clean">
+ <delete includeemptydirs="true">
+ <fileset dir="target"/>
+ </delete>
+ </target>
+
+</project>
Modified: tuscany/sandbox/travelsample/launchers/notification-corba/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-corba/pom.xml?rev=815533&r1=815384&r2=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-corba/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-corba/pom.xml Tue Sep 15 22:40:38 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-notification-corba-launcher</artifactId>
+ <artifactId>scatours-launcher-notification-corba</artifactId>
<name>Apache Tuscany SCA Tours Notification CORBA Service Launcher</name>
<dependencies>
@@ -55,7 +55,8 @@
<version>1.6-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
- <dependency>
+
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-corba-jse-tns</artifactId>
<version>1.6-SNAPSHOT</version>
Copied: tuscany/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java (from r815384, tuscany/sandbox/travelsample/launchers/notification-corba-launcher/src/main/java/scatours/LaunchNotificationCORBANode.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java?p2=tuscany/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java&p1=tuscany/sandbox/travelsample/launchers/notification-corba-launcher/src/main/java/scatours/LaunchNotificationCORBANode.java&r1=815384&r2=815533&rev=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-corba-launcher/src/main/java/scatours/LaunchNotificationCORBANode.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java Tue Sep 15 22:40:38 2009
@@ -26,15 +26,15 @@
import scatours.notification.Notification;
-public class LaunchNotificationCORBANode {
+public class NotificationCORBALauncher {
public static void main(String[] args) throws Exception {
SCAContribution notificationContribution =
- new SCAContribution("notification",
- "../../contributions/notification-contribution/target/classes");
+ new SCAContribution("notification",
+ "../../contributions/notification/target/classes");
SCAContribution notificationCORBAContribution =
new SCAContribution("notification-corba",
- "../../contributions/notification-corba-contribution/target/classes");
+ "../../contributions/notification-corba/target/classes");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"notification-corba.composite", notificationContribution, notificationCORBAContribution);
Added: tuscany/sandbox/travelsample/launchers/notification-ejb/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ejb/build.xml?rev=815533&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ejb/build.xml (added)
+++ tuscany/sandbox/travelsample/launchers/notification-ejb/build.xml Tue Sep 15 22:40:38 2009
@@ -0,0 +1,48 @@
+<!--
+ * 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.
+-->
+
+<project name="scatours-launcher-notification-ejb" 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>
+
+ <target name="run">
+ <java classname="scatours.NotificationEJBLauncher" fork="true">
+ <classpath>
+ <pathelement location="target/classes"/>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="clean">
+ <delete includeemptydirs="true">
+ <fileset dir="target"/>
+ </delete>
+ </target>
+
+</project>
Modified: tuscany/sandbox/travelsample/launchers/notification-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ejb/pom.xml?rev=815533&r1=815384&r2=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ejb/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-ejb/pom.xml Tue Sep 15 22:40:38 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-notification-ejb-launcher</artifactId>
+ <artifactId>scatours-launcher-notification-ejb</artifactId>
<name>Apache Tuscany SCA Tours Notification EJB Launcher</name>
<dependencies>
Copied: tuscany/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java (from r815384, tuscany/sandbox/travelsample/launchers/notification-ejb-launcher/src/main/java/scatours/LaunchNotificationEJBNode.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java?p2=tuscany/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java&p1=tuscany/sandbox/travelsample/launchers/notification-ejb-launcher/src/main/java/scatours/LaunchNotificationEJBNode.java&r1=815384&r2=815533&rev=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ejb-launcher/src/main/java/scatours/LaunchNotificationEJBNode.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java Tue Sep 15 22:40:38 2009
@@ -28,18 +28,18 @@
import scatours.notification.Notification;
-public class LaunchNotificationEJBNode {
+public class NotificationEJBLauncher {
public static void main(String[] args) throws Exception {
- System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
- System.setProperty(Context.PROVIDER_URL, "ejbd://localhost:4201");
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
+ System.setProperty(Context.PROVIDER_URL, "ejbd://localhost:4201");
- SCAContribution notificationContribution =
- new SCAContribution("notification",
- "../../contributions/notification-contribution/target/classes");
+ SCAContribution notificationContribution =
+ new SCAContribution("notification",
+ "../../contributions/notification/target/classes");
SCAContribution notificationEJBContribution =
new SCAContribution("notification-ejb",
- "../../contributions/notification-ejb-contribution/target/classes");
+ "../../contributions/notification-ejb/target/classes");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"notification-ejb.composite", notificationContribution, notificationEJBContribution);
Added: tuscany/sandbox/travelsample/launchers/notification-jms/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-jms/build.xml?rev=815533&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-jms/build.xml (added)
+++ tuscany/sandbox/travelsample/launchers/notification-jms/build.xml Tue Sep 15 22:40:38 2009
@@ -0,0 +1,57 @@
+<!--
+ * 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.
+-->
+
+<project name="scatours-launcher-notification-jms" 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>
+
+ <target name="run-broker">
+ <java classname="scatours.JMSBrokerLauncher" fork="true">
+ <classpath>
+ <pathelement location="target/classes"/>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="run">
+ <java classname="scatours.NotificationJMSLauncher" fork="true">
+ <classpath>
+ <pathelement location="target/classes"/>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="clean">
+ <delete includeemptydirs="true">
+ <fileset dir="target"/>
+ </delete>
+ </target>
+
+</project>
Modified: tuscany/sandbox/travelsample/launchers/notification-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-jms/pom.xml?rev=815533&r1=815384&r2=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-jms/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-jms/pom.xml Tue Sep 15 22:40:38 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-notification-jms-launcher</artifactId>
+ <artifactId>scatours-launcher-notification-jms</artifactId>
<name>Apache Tuscany SCA Tours Notification JMS Launcher</name>
<dependencies>
Copied: tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java (from r815384, tuscany/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java?p2=tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java&p1=tuscany/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java&r1=815384&r2=815533&rev=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/JMSBrokerLauncher.java Tue Sep 15 22:40:38 2009
@@ -20,7 +20,7 @@
import org.apache.activemq.broker.BrokerService;
-public class LaunchJMSBroker {
+public class JMSBrokerLauncher {
public static void main(String[] args) throws Exception {
final BrokerService jmsBroker = new BrokerService();
Copied: tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java (from r815384, tuscany/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchNotificationJMSNode.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java?p2=tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java&p1=tuscany/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchNotificationJMSNode.java&r1=815384&r2=815533&rev=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-jms-launcher/src/main/java/scatours/LaunchNotificationJMSNode.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java Tue Sep 15 22:40:38 2009
@@ -26,15 +26,15 @@
import scatours.notification.Notification;
-public class LaunchNotificationJMSNode {
+public class NotificationJMSLauncher {
public static void main(String[] args) throws Exception {
SCAContribution notificationContribution =
- new SCAContribution("notification",
- "../../contributions/notification-contribution/target/classes");
+ new SCAContribution("notification",
+ "../../contributions/notification/target/classes");
SCAContribution notificationJMSContribution =
new SCAContribution("notification-jms",
- "../../contributions/notification-jms-contribution/target/classes");
+ "../../contributions/notification-jms/target/classes");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"notification-jms.composite", notificationContribution, notificationJMSContribution);
Added: tuscany/sandbox/travelsample/launchers/notification-rmi/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-rmi/build.xml?rev=815533&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-rmi/build.xml (added)
+++ tuscany/sandbox/travelsample/launchers/notification-rmi/build.xml Tue Sep 15 22:40:38 2009
@@ -0,0 +1,48 @@
+<!--
+ * 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.
+-->
+
+<project name="scatours-launcher-notification-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>
+
+ <target name="run">
+ <java classname="scatours.NotificationRMILauncher" fork="true">
+ <classpath>
+ <pathelement location="target/classes"/>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="clean">
+ <delete includeemptydirs="true">
+ <fileset dir="target"/>
+ </delete>
+ </target>
+
+</project>
Modified: tuscany/sandbox/travelsample/launchers/notification-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-rmi/pom.xml?rev=815533&r1=815384&r2=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-rmi/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-rmi/pom.xml Tue Sep 15 22:40:38 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-notification-rmi-launcher</artifactId>
+ <artifactId>scatours-launcher-notification-rmi</artifactId>
<name>Apache Tuscany SCA Tours Notification RMI Launcher</name>
<dependencies>
Copied: tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java (from r815384, tuscany/sandbox/travelsample/launchers/notification-rmi-launcher/src/main/java/scatours/LaunchNotificationRMINode.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java?p2=tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java&p1=tuscany/sandbox/travelsample/launchers/notification-rmi-launcher/src/main/java/scatours/LaunchNotificationRMINode.java&r1=815384&r2=815533&rev=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-rmi-launcher/src/main/java/scatours/LaunchNotificationRMINode.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java Tue Sep 15 22:40:38 2009
@@ -26,15 +26,15 @@
import scatours.notification.Notification;
-public class LaunchNotificationRMINode {
+public class NotificationRMILauncher {
public static void main(String[] args) throws Exception {
SCAContribution notificationContribution =
- new SCAContribution("notification",
- "../../contributions/notification-contribution/target/classes");
+ new SCAContribution("notification",
+ "../../contributions/notification/target/classes");
SCAContribution notificationRMIContribution =
new SCAContribution("notification-rmi",
- "../../contributions/notification-rmi-contribution/target/classes");
+ "../../contributions/notification-rmi/target/classes");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"notification-rmi.composite", notificationContribution, notificationRMIContribution);
Added: tuscany/sandbox/travelsample/launchers/notification-ws/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ws/build.xml?rev=815533&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ws/build.xml (added)
+++ tuscany/sandbox/travelsample/launchers/notification-ws/build.xml Tue Sep 15 22:40:38 2009
@@ -0,0 +1,48 @@
+<!--
+ * 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.
+-->
+
+<project name="scatours-launcher-notification-ws" 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>
+
+ <target name="run">
+ <java classname="scatours.NotificationWSLauncher" fork="true">
+ <classpath>
+ <pathelement location="target/classes"/>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="clean">
+ <delete includeemptydirs="true">
+ <fileset dir="target"/>
+ </delete>
+ </target>
+
+</project>
Modified: tuscany/sandbox/travelsample/launchers/notification-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ws/pom.xml?rev=815533&r1=815384&r2=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ws/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/notification-ws/pom.xml Tue Sep 15 22:40:38 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-notification-ws-launcher</artifactId>
+ <artifactId>scatours-launcher-notification-ws</artifactId>
<name>Apache Tuscany SCA Tours Notification Web Service Launcher</name>
<dependencies>
Copied: tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java (from r815384, tuscany/sandbox/travelsample/launchers/notification-ws-launcher/src/main/java/scatours/LaunchNotificationWSNode.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java?p2=tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java&p1=tuscany/sandbox/travelsample/launchers/notification-ws-launcher/src/main/java/scatours/LaunchNotificationWSNode.java&r1=815384&r2=815533&rev=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/notification-ws-launcher/src/main/java/scatours/LaunchNotificationWSNode.java (original)
+++ tuscany/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java Tue Sep 15 22:40:38 2009
@@ -26,15 +26,15 @@
import scatours.notification.Notification;
-public class LaunchNotificationWSNode {
+public class NotificationWSLauncher {
public static void main(String[] args) throws Exception {
SCAContribution notificationContribution =
- new SCAContribution("notification",
- "../../contributions/notification-contribution/target/classes");
+ new SCAContribution("notification",
+ "../../contributions/notification/target/classes");
SCAContribution notificationWSContribution =
new SCAContribution("notification-ws",
- "../../contributions/notification-ws-contribution/target/classes");
+ "../../contributions/notification-ws/target/classes");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"notification-ws.composite", notificationContribution, notificationWSContribution);
Modified: tuscany/sandbox/travelsample/launchers/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/pom.xml?rev=815533&r1=815532&r2=815533&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/pom.xml Tue Sep 15 22:40:38 2009
@@ -54,11 +54,11 @@
<module>fullapp-domain</module>
<module>fullapp-nodes</module>
<module>help-pages</module>
- <module>notification-ws-launcher</module>
- <module>notification-corba-launcher</module>
- <module>notification-ejb-launcher</module>
- <module>notification-jms-launcher</module>
- <module>notification-rmi-launcher</module>
+ <module>notification-ws</module>
+ <module>notification-corba</module>
+ <module>notification-ejb</module>
+ <module>notification-jms</module>
+ <module>notification-rmi</module>
<module>policy</module>
</modules>
</profile>