Author: nash
Date: Wed May 19 22:13:37 2010
New Revision: 946460
URL: http://svn.apache.org/viewvc?rev=946460&view=rev
Log:
Merge revision r946354 from 1.0 release branch
Added:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-binaries.xml
- copied unchanged from r946354,
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/fullapp/src/main/resources/workspace-binaries.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-binaries.xml
- copied unchanged from r946354,
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/domainconfig/introducing/src/main/resources/workspace-binaries.xml
Removed:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml?rev=946460&r1=946459&r2=946460&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
Wed May 19 22:13:37 2010
@@ -30,9 +30,9 @@
</copy>
<copy todir="target/jar-classes/fullapp">
<fileset dir="src/main/resources">
- <include name="workspace-distribution.xml"/>
+ <include name="workspace-binaries.xml"/>
</fileset>
- <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
+ <globmapper from="workspace-binaries.xml" to="workspace.xml"/>
</copy>
</target>
</project>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml?rev=946460&r1=946459&r2=946460&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
Wed May 19 22:13:37 2010
@@ -34,7 +34,7 @@
<resource>
<directory>src/main/resources</directory>
<excludes>
- <exclude>workspace-distribution.xml</exclude>
+ <exclude>workspace-binaries.xml</exclude>
</excludes>
</resource>
</resources>
@@ -54,9 +54,9 @@
</copy>
<copy todir="target/jar-classes/fullapp">
<fileset dir="src/main/resources">
- <include
name="workspace-distribution.xml"/>
+ <include
name="workspace-binaries.xml"/>
</fileset>
- <globmapper
from="workspace-distribution.xml" to="workspace.xml"/>
+ <globmapper from="workspace-binaries.xml"
to="workspace.xml"/>
</copy>
</tasks>
</configuration>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml?rev=946460&r1=946459&r2=946460&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
Wed May 19 22:13:37 2010
@@ -30,9 +30,9 @@
</copy>
<copy todir="target/jar-classes/introducing">
<fileset dir="src/main/resources">
- <include name="workspace-distribution.xml"/>
+ <include name="workspace-binaries.xml"/>
</fileset>
- <globmapper from="workspace-distribution.xml" to="workspace.xml"/>
+ <globmapper from="workspace-binaries.xml" to="workspace.xml"/>
</copy>
</target>
</project>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml?rev=946460&r1=946459&r2=946460&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
Wed May 19 22:13:37 2010
@@ -34,7 +34,7 @@
<resource>
<directory>src/main/resources</directory>
<excludes>
- <exclude>workspace-distribution.xml</exclude>
+ <exclude>workspace-binaries.xml</exclude>
</excludes>
</resource>
</resources>
@@ -54,9 +54,9 @@
</copy>
<copy todir="target/jar-classes/introducing">
<fileset dir="src/main/resources">
- <include
name="workspace-distribution.xml"/>
+ <include
name="workspace-binaries.xml"/>
</fileset>
- <globmapper
from="workspace-distribution.xml" to="workspace.xml"/>
+ <globmapper from="workspace-binaries.xml"
to="workspace.xml"/>
</copy>
</tasks>
</configuration>
