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/15 17:10:10 UTC
svn commit: r944659 - in
/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution:
pom.xml src/main/assembly/src.xml
Author: nash
Date: Sat May 15 15:10:10 2010
New Revision: 944659
URL: http://svn.apache.org/viewvc?rev=944659&view=rev
Log:
Merge revision r937876 from trunk
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml
Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml?rev=944659&r1=944658&r2=944659&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/pom.xml Sat May 15 15:10:10 2010
@@ -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>
Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml?rev=944659&r1=944658&r2=944659&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/assembly/src.xml Sat May 15 15:10:10 2010
@@ -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>