diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-05-19 22:13:37 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-05-19 22:13:37 +0000 |
| commit | 4bdf141a7b1da51e6ed6caa7ea7964cf92d8ea8f (patch) | |
| tree | fa11252889d85792f246d34d7ba8127f4b2f6ef8 /sca-java-1.x/trunk/tutorials | |
| parent | e9d972d2cf64e6d14fb3304c73fbbd10eeb0928e (diff) | |
Merge revision r946354 from 1.0 release branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946460 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/tutorials')
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml | 4 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml | 6 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-binaries.xml (renamed from sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml | 4 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml | 6 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-binaries.xml (renamed from sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml) | 0 |
6 files changed, 10 insertions, 10 deletions
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml index 12229733f0..931bbc3ead 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml @@ -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>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml index 8ac5c0a7fc..03766729c3 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml @@ -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>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-binaries.xml index a7a3b01895..a7a3b01895 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-binaries.xml diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml index 8d3fb63a4a..19058058c3 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml @@ -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>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml index 046a92980d..001bf09f23 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml @@ -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>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-binaries.xml index 5c058ee325..5c058ee325 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-binaries.xml |