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

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

9 files changed, 11 insertions, 11 deletions

diff --git a/sandbox/travelsample/contributions/blog-feed-contribution/pom.xml b/sandbox/travelsample/contributions/blog-feed/pom.xml
index c74cdc6a3f..c93d2edc3f 100644
--- a/sandbox/travelsample/contributions/blog-feed-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/blog-feed/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

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

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

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

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

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

 

     <dependencies>

diff --git a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/java/scatours/blog/BlogPost.java b/sandbox/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/BlogPost.java
index 931a9f18c8..f93fe59b9d 100644
--- a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/java/scatours/blog/BlogPost.java
+++ b/sandbox/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/BlogPost.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package scatours.blog;
+package com.tuscanyscatours.blog;
 
 import java.util.Date;
 
diff --git a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/java/scatours/blog/feed/AtomBlogFeedImpl.java b/sandbox/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/AtomBlogFeedImpl.java
index e98c4dd433..edb8e17fc1 100644
--- a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/java/scatours/blog/feed/AtomBlogFeedImpl.java
+++ b/sandbox/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/AtomBlogFeedImpl.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package scatours.blog.feed;
+package com.tuscanyscatours.blog.feed.impl;
 
 import java.util.List;
 
@@ -27,7 +27,7 @@ import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.Feed;
 import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
 
-import scatours.blog.BlogPost;
+import com.tuscanyscatours.blog.BlogPost;
 
 /**
  * An Atom feed that implements the org.apache.tuscany.sca.binding.atom.collection.Collection
diff --git a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/java/scatours/blog/feed/BaseBlogFeedImpl.java b/sandbox/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/BaseBlogFeedImpl.java
index ca898fe2ad..1579480dc7 100644
--- a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/java/scatours/blog/feed/BaseBlogFeedImpl.java
+++ b/sandbox/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/BaseBlogFeedImpl.java
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package scatours.blog.feed;
+package com.tuscanyscatours.blog.feed.impl;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import scatours.blog.BlogPost;
+import com.tuscanyscatours.blog.BlogPost;
 
 /**
  * Base class for all blog feeds that provides the common methods
diff --git a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/java/scatours/blog/feed/GenericBlogFeedImpl.java b/sandbox/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/GenericBlogFeedImpl.java
index dbc0de429d..816360d4fd 100644
--- a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/java/scatours/blog/feed/GenericBlogFeedImpl.java
+++ b/sandbox/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/GenericBlogFeedImpl.java
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package scatours.blog.feed;
+package com.tuscanyscatours.blog.feed.impl;
 
 import java.util.List;
 
 import org.apache.tuscany.sca.data.collection.Entry;
 import org.apache.tuscany.sca.data.collection.Item;
 
-import scatours.blog.BlogPost;
+import com.tuscanyscatours.blog.BlogPost;
 
 /**
  * Implementation of the blog feed that uses the Tuscany Data API so
diff --git a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/java/scatours/blog/feed/RSSBlogFeedImpl.java b/sandbox/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/RSSBlogFeedImpl.java
index e728bf7617..b4526af5d0 100644
--- a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/java/scatours/blog/feed/RSSBlogFeedImpl.java
+++ b/sandbox/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/RSSBlogFeedImpl.java
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package scatours.blog.feed;
+package com.tuscanyscatours.blog.feed.impl;
 
 import java.util.List;
 
 import org.apache.tuscany.sca.binding.rss.collection.NotFoundException;
 
-import scatours.blog.BlogPost;
+import com.tuscanyscatours.blog.BlogPost;
 
 import com.sun.syndication.feed.synd.SyndContent;
 import com.sun.syndication.feed.synd.SyndContentImpl;
diff --git a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/blog-feed/src/main/resources/META-INF/sca-contribution.xml
index b4152d6e3f..b4152d6e3f 100644
--- a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/blog-feed/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/resources/blog-feed.composite b/sandbox/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite
index 1c9cd044b3..1c9cd044b3 100644
--- a/sandbox/travelsample/contributions/blog-feed-contribution/src/main/resources/blog-feed.composite
+++ b/sandbox/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index 66571e552b..e81c225276 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -37,7 +37,7 @@
                 <activeByDefault>true</activeByDefault>

             </activation>

             <modules>

-                <module>blog-feed-contribution/</module>

+                <module>blog-feed</module>

                 <module>calendar</module>

                 <module>car</module>

                 <module>common</module>