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 19:57:12 UTC
svn commit: r946311 - 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 17:57:11 2010
New Revision: 946311
URL: http://svn.apache.org/viewvc?rev=946311&view=rev
Log:
Change domainconfig directory structure to make ant build of binaries module work
Added:
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/fullapp/src/main/resources/fullapp/cloud/
- copied from r945072, 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/fullapp/cloud.composite
- copied unchanged from r945072, 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/fullapp/cloud/fullapp-bespoketrip.composite
- copied unchanged from r946289, 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/fullapp/cloud/fullapp-coordination.composite
- copied unchanged from r946289, 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/fullapp/cloud/fullapp-creditcard.composite
- copied unchanged from r946289, 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/fullapp/cloud/fullapp-currency.composite
- copied unchanged from r946289, 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/fullapp/cloud/fullapp-packagedtrip.composite
- copied unchanged from r946289, 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/fullapp/cloud/fullapp-payment.composite
- copied unchanged from r946289, 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/fullapp/cloud/fullapp-shoppingcart.composite
- copied unchanged from r946289, 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/fullapp/cloud/fullapp-ui.composite
- copied unchanged from r946289, 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/fullapp/domain.composite
- copied unchanged from r946289, 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/fullapp/workspace-distribution.xml
- copied unchanged from r945072, 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/fullapp/workspace.xml
- copied unchanged from r945072, 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/introducing/
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/introducing/cloud/
- copied from r946289, 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/introducing/cloud.composite
- copied unchanged from r946289, 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/introducing/domain.composite
- copied unchanged from r946289, 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/introducing/workspace-distribution.xml
- copied unchanged from r946289, 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/introducing/workspace.xml
- copied unchanged from r946289, 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/cloud/
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/domain.composite
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
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
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
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace.xml
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=946311&r1=946310&r2=946311&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 17:57:11 2010
@@ -48,12 +48,12 @@
<tasks>
<mkdir dir="target/jar-classes/fullapp"/>
<copy todir="target/jar-classes/fullapp">
- <fileset dir="src/main/resources">
+ <fileset dir="src/main/resources/fullapp">
<exclude name="workspace*.xml"/>
</fileset>
</copy>
<copy todir="target/jar-classes/fullapp">
- <fileset dir="src/main/resources">
+ <fileset dir="src/main/resources/fullapp">
<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=946311&r1=946310&r2=946311&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 17:57:11 2010
@@ -48,12 +48,12 @@
<tasks>
<mkdir dir="target/jar-classes/introducing"/>
<copy todir="target/jar-classes/introducing">
- <fileset dir="src/main/resources">
+ <fileset dir="src/main/resources/introducing">
<exclude name="workspace*.xml"/>
</fileset>
</copy>
<copy todir="target/jar-classes/introducing">
- <fileset dir="src/main/resources">
+ <fileset dir="src/main/resources/introducing">
<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=946311&r1=946310&r2=946311&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 17:57:11 2010
@@ -32,7 +32,7 @@
<include name="tuscany-node-launcher-*.jar"/>
</fileset>
</classpath>
- <arg value="../../domainconfig/fullapp/target/classes"/>
+ <arg value="../../domainconfig/fullapp/target/classes/fullapp"/>
</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=946311&r1=946310&r2=946311&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 17:57:11 2010
@@ -32,7 +32,7 @@
<include name="tuscany-node-launcher-*.jar"/>
</fileset>
</classpath>
- <arg value="../../domainconfig/introducing/target/classes"/>
+ <arg value="../../domainconfig/introducing/target/classes/introducing"/>
</java>
</target>
</project>