Apply new naming convention to contributions/feed-logger and launchers/feed-logger

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

6 files changed, 10 insertions, 9 deletions

diff --git a/sandbox/travelsample/contributions/feed-logger-contribution/pom.xml b/sandbox/travelsample/contributions/feed-logger/pom.xml
index 2b54ba5b7d..2c70e79528 100644
--- a/sandbox/travelsample/contributions/feed-logger-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/feed-logger/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

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

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

-    <artifactId>scatours-feed-logger-contribution</artifactId>

+    <artifactId>scatours-contribution-feed-logger</artifactId>

     <name>Apache Tuscany SCA Tours Feed Logger Contribution</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLogger.java b/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.java
index 8187e34d2c..0f5d18d53b 100644
--- a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLogger.java
+++ b/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package scatours.feedlogger;
+package com.tuscanyscatours.feedlogger;
 
 public interface FeedLogger {
 
diff --git a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLoggerImpl.java b/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java
index aada73fd83..7f1e25a828 100644
--- a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLoggerImpl.java
+++ b/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java
@@ -17,10 +17,12 @@
  * under the License.
  */
 
-package scatours.feedlogger;
+package com.tuscanyscatours.feedlogger.impl;
 
 import java.util.List;
 
+import com.tuscanyscatours.feedlogger.FeedLogger;
+
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.Feed;
 import org.osoa.sca.annotations.Reference;
diff --git a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml
index 181a1ec77c..556807a0f0 100644
--- a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml
@@ -18,5 +18,4 @@
     * under the License.    

 -->

 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">

-   <export.java package="scatours.feedlogger"/>

-</contribution>
\ No newline at end of file
+</contribution>

diff --git a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/resources/feed-logger.composite b/sandbox/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite
index 62f5f2258c..17c24adefb 100644
--- a/sandbox/travelsample/contributions/feed-logger-contribution/src/main/resources/feed-logger.composite
+++ b/sandbox/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite
@@ -19,14 +19,14 @@
 -->

 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-    targetNamespace="http://goodvaluetrips.com/"

-    name="feed-logger">

+    targetNamespace="http://tuscanyscatours.com/"

+    name="feedLogger">

 

     <service name="FeedLogger" promote="FeedLogger">

     </service>

 

     <component name="FeedLogger">

-        <implementation.java class="scatours.feedlogger.FeedLoggerImpl"/>

+        <implementation.java class="com.tuscanyscatours.feedlogger.impl.FeedLoggerImpl"/>

         <reference name="scaToursBlogAtom">

             <tuscany:binding.atom uri="http://scatours.wordpress.com/?feed=atom"/>

         </reference>

diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index e81c225276..63042e9deb 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -52,7 +52,7 @@
                 <module>currency-ws</module>

                 <module>databinding-client</module>

                 <module>emailgateway</module>

-                <module>feed-logger-contribution</module>

+                <module>feed-logger</module>

                 <module>flight</module>

                 <module>fullapp-ui</module>

                 <module>fullapp-frontend</module>