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

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

5 files changed, 57 insertions, 10 deletions

diff --git a/sandbox/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite b/sandbox/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite
index 1c9cd044b3..751fd33cd2 100644
--- a/sandbox/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite
+++ b/sandbox/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite
@@ -19,9 +19,8 @@
 -->

 <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="blog-feed">

-

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

+    name="blogFeed">

 

     <!-- Example that shows using the Tuscany Data APIs to create a feed that -->

     <!-- is independent of the Feed API -->

@@ -34,7 +33,7 @@
     </service>

 

     <component name="BlogFeed">

-        <implementation.java class="scatours.blog.feed.GenericBlogFeedImpl"/>

+        <implementation.java class="com.tuscanyscatours.blog.feed.impl.GenericBlogFeedImpl"/>

     </component>

 

     <!-- Example that shows using the Atom Collections API to create a feed that -->

@@ -44,7 +43,7 @@
     </service>

 

     <component name="BlogAtom">

-        <implementation.java class="scatours.blog.feed.AtomBlogFeedImpl"/>

+        <implementation.java class="com.tuscanyscatours.blog.feed.impl.AtomBlogFeedImpl"/>

     </component>

 

     <!-- Example that shows using the RSS Collections API to create a feed that -->

@@ -54,6 +53,6 @@
     </service>

 

     <component name="BlogRSS">

-        <implementation.java class="scatours.blog.feed.RSSBlogFeedImpl"/>

+        <implementation.java class="com.tuscanyscatours.blog.feed.impl.RSSBlogFeedImpl"/>

     </component>

 </composite>

diff --git a/sandbox/travelsample/launchers/blog-feed/build.xml b/sandbox/travelsample/launchers/blog-feed/build.xml
new file mode 100644
index 0000000000..d243ed2dba
--- /dev/null
+++ b/sandbox/travelsample/launchers/blog-feed/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-blog-feed" 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.BlogFeedLauncher" 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/blog-feed-launcher/pom.xml b/sandbox/travelsample/launchers/blog-feed/pom.xml
index 27982d866a..a1c022edae 100644
--- a/sandbox/travelsample/launchers/blog-feed-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/blog-feed/pom.xml
@@ -25,7 +25,7 @@
         <version>1.5</version>

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

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

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

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

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

 

     <dependencies>

diff --git a/sandbox/travelsample/launchers/blog-feed-launcher/src/main/java/scatours/LaunchBlogFeedNode.java b/sandbox/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java
index 0000f75d0b..f6712dc00e 100644
--- a/sandbox/travelsample/launchers/blog-feed-launcher/src/main/java/scatours/LaunchBlogFeedNode.java
+++ b/sandbox/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java
@@ -23,12 +23,12 @@ import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;

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

 

-public class LaunchBlogFeedNode {

+public class BlogFeedLauncher {

 

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

         SCAContribution feedContribution = 

           new SCAContribution("blog-feed", 

-              "../../contributions/blog-feed-contribution/target/classes");

+              "../../contributions/blog-feed/target/classes");

 

         SCANode node = SCANodeFactory.newInstance().createSCANode(

             "blog-feed.composite", feedContribution);

diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index fa38c0b315..fcbd21048c 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -37,7 +37,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>blog-feed-launcher</module>
+                <module>blog-feed</module>
                 <module>currency-converter</module>
                 <module>currency-converter-corba</module>
                 <module>currency-converter-jms</module>