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

8 files changed, 4 insertions, 4 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>