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 2010/05/19 20:20:13 UTC

svn commit: r946324 - in /tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0: domainconfig/fullapp/ domainconfig/fullapp/src/main/resources/ domainconfig/fullapp/src/main/resources/cloud/ domainconfig/fullapp/src/main/resources/fullapp/ domainconf...

Author: nash
Date: Wed May 19 18:20:12 2010
New Revision: 946324

URL: http://svn.apache.org/viewvc?rev=946324&view=rev
Log:
Reverse the commit for revision r946311

Added:
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/
      - copied from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/domain.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace.xml
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/
      - copied from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/domain.composite
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/domain.composite
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace-distribution.xml
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace-distribution.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace.xml
      - copied unchanged from r946310, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace.xml
Removed:
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/fullapp/
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/
Modified:
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml?rev=946324&r1=946323&r2=946324&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/pom.xml Wed May 19 18:20:12 2010
@@ -48,12 +48,12 @@
                             <tasks>
                                 <mkdir dir="target/jar-classes/fullapp"/>
                                 <copy todir="target/jar-classes/fullapp">
-                                    <fileset dir="src/main/resources/fullapp">
+                                    <fileset dir="src/main/resources">
                                         <exclude name="workspace*.xml"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="target/jar-classes/fullapp">
-                                    <fileset dir="src/main/resources/fullapp">
+                                    <fileset dir="src/main/resources">
                                         <include name="workspace-distribution.xml"/>
                                     </fileset>
                                     <globmapper from="workspace-distribution.xml" to="workspace.xml"/>

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml?rev=946324&r1=946323&r2=946324&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/pom.xml Wed May 19 18:20:12 2010
@@ -48,12 +48,12 @@
                             <tasks>
                                 <mkdir dir="target/jar-classes/introducing"/>
                                 <copy todir="target/jar-classes/introducing">
-                                    <fileset dir="src/main/resources/introducing">
+                                    <fileset dir="src/main/resources">
                                         <exclude name="workspace*.xml"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="target/jar-classes/introducing">
-                                    <fileset dir="src/main/resources/introducing">
+                                    <fileset dir="src/main/resources">
                                         <include name="workspace-distribution.xml"/>
                                     </fileset>
                                     <globmapper from="workspace-distribution.xml" to="workspace.xml"/>

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml?rev=946324&r1=946323&r2=946324&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp-domain/build.xml Wed May 19 18:20:12 2010
@@ -32,7 +32,7 @@
                     <include name="tuscany-node-launcher-*.jar"/>
                 </fileset>
             </classpath>
-            <arg value="../../domainconfig/fullapp/target/classes/fullapp"/>
+            <arg value="../../domainconfig/fullapp/target/classes"/>
         </java>
     </target>
 </project>

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml?rev=946324&r1=946323&r2=946324&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing-domain/build.xml Wed May 19 18:20:12 2010
@@ -32,7 +32,7 @@
                     <include name="tuscany-node-launcher-*.jar"/>
                 </fileset>
             </classpath>
-            <arg value="../../domainconfig/introducing/target/classes/introducing"/>
+            <arg value="../../domainconfig/introducing/target/classes"/>
         </java>
     </target>
 </project>