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 21:16:29 UTC
svn commit: r815456 - in /tuscany/sandbox/travelsample: contributions/
contributions/help-pages-contribution/ contributions/help-pages/
contributions/help-pages/src/main/resources/ launchers/
launchers/help-pages-launcher/ launchers/help-pages/ launche...
Author: nash
Date: Tue Sep 15 19:16:29 2009
New Revision: 815456
URL: http://svn.apache.org/viewvc?rev=815456&view=rev
Log:
Apply new naming convention to contributions/help-pages and launchers/help-pages
Added:
tuscany/sandbox/travelsample/contributions/help-pages/
- copied from r815384, tuscany/sandbox/travelsample/contributions/help-pages-contribution/
tuscany/sandbox/travelsample/launchers/help-pages/
- copied from r815384, tuscany/sandbox/travelsample/launchers/help-pages-launcher/
tuscany/sandbox/travelsample/launchers/help-pages/build.xml
tuscany/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java
- copied, changed from r815384, tuscany/sandbox/travelsample/launchers/help-pages-launcher/src/main/java/scatours/LaunchHelpPagesNode.java
Removed:
tuscany/sandbox/travelsample/contributions/help-pages-contribution/
tuscany/sandbox/travelsample/launchers/help-pages-launcher/
tuscany/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/LaunchHelpPagesNode.java
Modified:
tuscany/sandbox/travelsample/contributions/help-pages/pom.xml
tuscany/sandbox/travelsample/contributions/help-pages/src/main/resources/help-pages.composite
tuscany/sandbox/travelsample/contributions/pom.xml
tuscany/sandbox/travelsample/launchers/help-pages/pom.xml
tuscany/sandbox/travelsample/launchers/pom.xml
Modified: tuscany/sandbox/travelsample/contributions/help-pages/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/help-pages/pom.xml?rev=815456&r1=815384&r2=815456&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/help-pages/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/help-pages/pom.xml Tue Sep 15 19:16:29 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/help-pages/src/main/resources/help-pages.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/help-pages/src/main/resources/help-pages.composite?rev=815456&r1=815384&r2=815456&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/help-pages/src/main/resources/help-pages.composite (original)
+++ tuscany/sandbox/travelsample/contributions/help-pages/src/main/resources/help-pages.composite Tue Sep 15 19:16:29 2009
@@ -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"/>
Modified: tuscany/sandbox/travelsample/contributions/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/pom.xml?rev=815456&r1=815455&r2=815456&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/pom.xml Tue Sep 15 19:16:29 2009
@@ -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>
Added: tuscany/sandbox/travelsample/launchers/help-pages/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/help-pages/build.xml?rev=815456&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/launchers/help-pages/build.xml (added)
+++ tuscany/sandbox/travelsample/launchers/help-pages/build.xml Tue Sep 15 19:16:29 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-help-pages" 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.HelpPagesLauncher" 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/help-pages/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/help-pages/pom.xml?rev=815456&r1=815384&r2=815456&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/help-pages/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/help-pages/pom.xml Tue Sep 15 19:16:29 2009
@@ -25,7 +25,7 @@
<version>1.5</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-help-pages-launcher</artifactId>
+ <artifactId>scatours-launcher-help-pages</artifactId>
<name>Apache Tuscany SCA Tours Help Pages Launcher</name>
<dependencies>
Copied: tuscany/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java (from r815384, tuscany/sandbox/travelsample/launchers/help-pages-launcher/src/main/java/scatours/LaunchHelpPagesNode.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java?p2=tuscany/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java&p1=tuscany/sandbox/travelsample/launchers/help-pages-launcher/src/main/java/scatours/LaunchHelpPagesNode.java&r1=815384&r2=815456&rev=815456&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/help-pages-launcher/src/main/java/scatours/LaunchHelpPagesNode.java (original)
+++ tuscany/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java Tue Sep 15 19:16:29 2009
@@ -23,15 +23,15 @@
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
-public class LaunchHelpPagesNode {
+public class HelpPagesLauncher {
public static void main(String[] args) throws Exception {
SCAContribution helpContribution =
new SCAContribution("help-pages",
- "../../contributions/help-pages-contribution/target/classes");
+ "../../contributions/help-pages/target/classes");
SCANode node = SCANodeFactory.newInstance().createSCANode(
- "help-pages.composite",helpContribution);
+ "help-pages.composite", helpContribution);
node.start();
System.out.println("Node started - Press enter to shutdown.");
Modified: tuscany/sandbox/travelsample/launchers/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/pom.xml?rev=815456&r1=815455&r2=815456&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/pom.xml Tue Sep 15 19:16:29 2009
@@ -53,7 +53,7 @@
<module>fullapp</module>
<module>fullapp-domain</module>
<module>fullapp-nodes</module>
- <module>help-pages-launcher</module>
+ <module>help-pages</module>
<module>notification-ws-launcher</module>
<module>notification-corba-launcher</module>
<module>notification-ejb-launcher</module>