summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-05-15 15:10:10 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-05-15 15:10:10 +0000
commit1bb2751f6f9ce594bb856fee3165cfafd5ecab7a (patch)
tree3b970d3b92d95a84511f47d872b89518ca78682e /sca-java-1.x/branches
parent03f141786f5c38d8440f7544b11aa80c34837378 (diff)
Merge revision r937876 from trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@944659 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/branches')
-rw-r--r--sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml28
-rw-r--r--sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml36
2 files changed, 63 insertions, 1 deletions
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml
index 0f8f681c64..b112773d31 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml
@@ -31,6 +31,34 @@
<name>Apache Tuscany SCA Tours Distribution</name>
<packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ <version>2.1.7</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <!-- exclude the following because it's already included in binaries/target/jaxws -->
+ <exclusion>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ </exclusion>
+ <!-- exclude the following because it's part of the Tuscany SCA binary distro -->
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml
index 28ffcf7e3b..36e67f6d77 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml
@@ -44,7 +44,7 @@
</excludes>
</fileSet>
- <!-- Add the text files to the top-level directroy -->
+ <!-- Add the text files to the top-level directory -->
<fileSet>
<directory>src/main/release</directory>
<outputDirectory></outputDirectory>
@@ -57,6 +57,40 @@
<include>RELEASE_NOTES</include>
</includes>
</fileSet>
+
+ <!-- Add binary dependencies to the lib directory -->
+ <fileSet>
+ <directory>../binaries/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>openejb/**/*</include>
+ <include>jaxws/**/*</include>
+ </includes>
+ </fileSet>
</fileSets>
+ <dependencySets>
+ <!-- Add tools dependencies to the lib directory -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib/jaxws</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>com.sun.xml.ws:jaxws-tools</include>
+ </includes>
+ <scope>runtime</scope>
+ </dependencySet>
+
+ <!-- Add tools dependencies to the lib directory -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib/junit</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>junit:junit</include>
+ </includes>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+
</assembly>