Apply new naming convention to contributions/help-pages and launchers/help-pages

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

12 files changed, 57 insertions, 9 deletions

diff --git a/sandbox/travelsample/contributions/help-pages-contribution/pom.xml b/sandbox/travelsample/contributions/help-pages/pom.xml
index 5896754423..dde35814ed 100644
--- a/sandbox/travelsample/contributions/help-pages-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/help-pages/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

         <!--relativePath>../../pom.xml</relativePath-->

     </parent><version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-help-pages-contribution</artifactId>

+    <artifactId>scatours-contribution-help-pages</artifactId>

     <name>Apache Tuscany SCA Tours Help Pages Contribution</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/help-pages/src/main/resources/META-INF/sca-contribution.xml
index 038f9260b4..038f9260b4 100644
--- a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/help-pages/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/help-pages.composite b/sandbox/travelsample/contributions/help-pages/src/main/resources/help-pages.composite
index d440730b8f..1ef8c0a6b1 100644
--- a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/help-pages.composite
+++ b/sandbox/travelsample/contributions/help-pages/src/main/resources/help-pages.composite
@@ -19,8 +19,8 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
   xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-  targetNamespace="http://www.tuscanyscatours.com"
-  name="help-pages">
+  targetNamespace="http://www.tuscanyscatours.com/"
+  name="helpPages">
 
     <component name="Help">
         <tuscany:implementation.resource location="help_pages"/>
diff --git a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/help_pages/BookingAHoliday.html b/sandbox/travelsample/contributions/help-pages/src/main/resources/help_pages/BookingAHoliday.html
index 194ecd1183..194ecd1183 100644
--- a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/help_pages/BookingAHoliday.html
+++ b/sandbox/travelsample/contributions/help-pages/src/main/resources/help_pages/BookingAHoliday.html
diff --git a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/help_pages/BookingAHotel.html b/sandbox/travelsample/contributions/help-pages/src/main/resources/help_pages/BookingAHotel.html
index bde4d25226..bde4d25226 100644
--- a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/help_pages/BookingAHotel.html
+++ b/sandbox/travelsample/contributions/help-pages/src/main/resources/help_pages/BookingAHotel.html
diff --git a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/help_pages/MakingPayments.html b/sandbox/travelsample/contributions/help-pages/src/main/resources/help_pages/MakingPayments.html
index a1b24f4d23..a1b24f4d23 100644
--- a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/help_pages/MakingPayments.html
+++ b/sandbox/travelsample/contributions/help-pages/src/main/resources/help_pages/MakingPayments.html
diff --git a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/help_pages/index.html b/sandbox/travelsample/contributions/help-pages/src/main/resources/help_pages/index.html
index 4972752ea1..4972752ea1 100644
--- a/sandbox/travelsample/contributions/help-pages-contribution/src/main/resources/help_pages/index.html
+++ b/sandbox/travelsample/contributions/help-pages/src/main/resources/help_pages/index.html
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index 63042e9deb..49473cdba6 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -60,7 +60,7 @@
                 <module>fullapp-packagedtrip</module>

                 <module>fullapp-bespoketrip</module>

                 <module>fullapp-shoppingcart</module>

-                <module>help-pages-contribution</module>

+                <module>help-pages</module>

                 <module>hotel</module>

                 <module>interaction-client</module>

                 <module>interaction-service-remote</module>

diff --git a/sandbox/travelsample/launchers/help-pages/build.xml b/sandbox/travelsample/launchers/help-pages/build.xml
new file mode 100644
index 0000000000..2bbb462dca
--- /dev/null
+++ b/sandbox/travelsample/launchers/help-pages/build.xml
@@ -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-help-pages" 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.HelpPagesLauncher" 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>

diff --git a/sandbox/travelsample/launchers/help-pages-launcher/pom.xml b/sandbox/travelsample/launchers/help-pages/pom.xml
index e6e824674a..b4b2233e25 100644
--- a/sandbox/travelsample/launchers/help-pages-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/help-pages/pom.xml
@@ -25,7 +25,7 @@
         <version>1.5</version>

         <!--relativePath>../../pom.xml</relativePath-->

     </parent><version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-help-pages-launcher</artifactId>

+    <artifactId>scatours-launcher-help-pages</artifactId>

     <name>Apache Tuscany SCA Tours Help Pages Launcher</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/launchers/help-pages-launcher/src/main/java/scatours/LaunchHelpPagesNode.java b/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java
index 0b45920327..b363748a63 100644
--- a/sandbox/travelsample/launchers/help-pages-launcher/src/main/java/scatours/LaunchHelpPagesNode.java
+++ b/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java
@@ -23,15 +23,15 @@ import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;

 import org.apache.tuscany.sca.node.SCANodeFactory;

 

-public class LaunchHelpPagesNode {

+public class HelpPagesLauncher {

 

     public static void main(String[] args) throws Exception {

         SCAContribution helpContribution = 

           new SCAContribution("help-pages", 

-              "../../contributions/help-pages-contribution/target/classes");

+              "../../contributions/help-pages/target/classes");

 

         SCANode node = SCANodeFactory.newInstance().createSCANode(

-            "help-pages.composite",helpContribution);

+            "help-pages.composite", helpContribution);

         node.start();

 

         System.out.println("Node started - Press enter to shutdown.");

diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index a9b4ca8b61..3ffe665142 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -53,7 +53,7 @@
                 <module>fullapp</module>
                 <module>fullapp-domain</module>
                 <module>fullapp-nodes</module>
-                <module>help-pages-launcher</module>
+                <module>help-pages</module>
                 <module>notification-ws-launcher</module>
                 <module>notification-corba-launcher</module>
                 <module>notification-ejb-launcher</module>