You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2009/09/15 19:18:55 UTC
svn commit: r815406 - in /tuscany/sandbox/travelsample: contributions/
contributions/feed-logger-contribution/ contributions/feed-logger/
contributions/feed-logger/src/main/java/com/
contributions/feed-logger/src/main/java/com/tuscanyscatours/ contribu...
Author: nash
Date: Tue Sep 15 17:18:54 2009
New Revision: 815406
URL: http://svn.apache.org/viewvc?rev=815406&view=rev
Log:
Apply new naming convention to contributions/feed-logger and launchers/feed-logger
Added:
tuscany/sandbox/travelsample/contributions/feed-logger/
- copied from r815384, tuscany/sandbox/travelsample/contributions/feed-logger-contribution/
tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/
tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/
tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/
tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.java
- copied, changed from r815384, tuscany/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLogger.java
tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/
tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java
- copied, changed from r815384, tuscany/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLoggerImpl.java
tuscany/sandbox/travelsample/launchers/feed-logger/
- copied from r815384, tuscany/sandbox/travelsample/launchers/feed-logger-launcher/
tuscany/sandbox/travelsample/launchers/feed-logger/build.xml
tuscany/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java
- copied, changed from r815384, tuscany/sandbox/travelsample/launchers/feed-logger-launcher/src/main/java/scatours/LaunchFeedLoggerNode.java
Removed:
tuscany/sandbox/travelsample/contributions/feed-logger-contribution/
tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/scatours/
tuscany/sandbox/travelsample/launchers/feed-logger-launcher/
tuscany/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/LaunchFeedLoggerNode.java
Modified:
tuscany/sandbox/travelsample/contributions/feed-logger/pom.xml
tuscany/sandbox/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite
tuscany/sandbox/travelsample/contributions/pom.xml
tuscany/sandbox/travelsample/launchers/feed-logger/pom.xml
tuscany/sandbox/travelsample/launchers/pom.xml
Modified: tuscany/sandbox/travelsample/contributions/feed-logger/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/feed-logger/pom.xml?rev=815406&r1=815384&r2=815406&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/feed-logger/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/feed-logger/pom.xml Tue Sep 15 17:18:54 2009
@@ -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>
Copied: tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.java (from r815384, tuscany/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLogger.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.java?p2=tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.java&p1=tuscany/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLogger.java&r1=815384&r2=815406&rev=815406&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLogger.java (original)
+++ tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.java Tue Sep 15 17:18:54 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package scatours.feedlogger;
+package com.tuscanyscatours.feedlogger;
public interface FeedLogger {
Copied: tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java (from r815384, tuscany/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLoggerImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java?p2=tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java&p1=tuscany/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLoggerImpl.java&r1=815384&r2=815406&rev=815406&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/feed-logger-contribution/src/main/java/scatours/feedlogger/FeedLoggerImpl.java (original)
+++ tuscany/sandbox/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java Tue Sep 15 17:18:54 2009
@@ -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;
Modified: tuscany/sandbox/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml?rev=815406&r1=815384&r2=815406&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml Tue Sep 15 17:18:54 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite?rev=815406&r1=815384&r2=815406&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite (original)
+++ tuscany/sandbox/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite Tue Sep 15 17:18:54 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/pom.xml?rev=815406&r1=815405&r2=815406&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/pom.xml Tue Sep 15 17:18:54 2009
@@ -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>
Added: tuscany/sandbox/travelsample/launchers/feed-logger/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/feed-logger/build.xml?rev=815406&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/launchers/feed-logger/build.xml (added)
+++ tuscany/sandbox/travelsample/launchers/feed-logger/build.xml Tue Sep 15 17:18:54 2009
@@ -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-feed-logger" 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.FeedLoggerLauncher" 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>
Modified: tuscany/sandbox/travelsample/launchers/feed-logger/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/feed-logger/pom.xml?rev=815406&r1=815384&r2=815406&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/feed-logger/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/feed-logger/pom.xml Tue Sep 15 17:18:54 2009
@@ -25,7 +25,7 @@
<version>1.5</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-feed-logger-launcher</artifactId>
+ <artifactId>scatours-launcher-feed-logger</artifactId>
<name>Apache Tuscany SCA Tours Feed Logger Launcher</name>
<dependencies>
Copied: tuscany/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java (from r815384, tuscany/sandbox/travelsample/launchers/feed-logger-launcher/src/main/java/scatours/LaunchFeedLoggerNode.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java?p2=tuscany/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java&p1=tuscany/sandbox/travelsample/launchers/feed-logger-launcher/src/main/java/scatours/LaunchFeedLoggerNode.java&r1=815384&r2=815406&rev=815406&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/feed-logger-launcher/src/main/java/scatours/LaunchFeedLoggerNode.java (original)
+++ tuscany/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java Tue Sep 15 17:18:54 2009
@@ -26,12 +26,12 @@
import scatours.feedlogger.FeedLogger;
-public class LaunchFeedLoggerNode {
+public class FeedLoggerLauncher {
public static void main(String[] args) throws Exception {
SCAContribution feedContribution =
new SCAContribution("feed-logger",
- "../../contributions/feed-logger-contribution/target/classes");
+ "../../contributions/feed-logger/target/classes");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"feed-logger.composite", feedContribution);
Modified: tuscany/sandbox/travelsample/launchers/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/pom.xml?rev=815406&r1=815405&r2=815406&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/pom.xml Tue Sep 15 17:18:54 2009
@@ -44,7 +44,7 @@
<module>currency-converter-rmi</module>
<module>currency-converter-ws</module>
<module>databinding</module>
- <module>feed-logger-launcher</module>
+ <module>feed-logger</module>
<module>interaction</module>
<module>introducing</module>
<module>introducing-client</module>