You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/10/08 15:57:43 UTC
svn commit: r1005831 - in /tuscany/sca-java-2.x/trunk/distribution/all:
pom.xml src/main/components/bin-lib.xml
Author: slaws
Date: Fri Oct 8 13:57:43 2010
New Revision: 1005831
URL: http://svn.apache.org/viewvc?rev=1005831&view=rev
Log:
Make the all distro depend on the "all" features rather than depending on it and some random jars. Also add in the aggregations to see how they look.
Modified:
tuscany/sca-java-2.x/trunk/distribution/all/pom.xml
tuscany/sca-java-2.x/trunk/distribution/all/src/main/components/bin-lib.xml
Modified: tuscany/sca-java-2.x/trunk/distribution/all/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/pom.xml?rev=1005831&r1=1005830&r2=1005831&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/pom.xml Fri Oct 8 13:57:43 2010
@@ -31,6 +31,9 @@
<packaging>pom</packaging>
<dependencies>
+
+ <!-- module jars for modules directory -->
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-all</artifactId>
@@ -38,58 +41,23 @@
<version>2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
+ <!-- aggregation jars for lib directory -->
-<!-- TUSCANY-3674 - shouldn't these be in the all feature -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-domain-node</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ejb-runtime</artifactId>
+ <groupId>org.apache.tuscany.sca.aggregation</groupId>
+ <artifactId>tuscany-base-runtime-aggregation</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-hazelcast-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-client</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-tracing-aspectj</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>1.6.8</version>
- </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca.aggregation</groupId>
+ <artifactId>tuscany-binding-rmi-runtime-aggregation</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-spring</artifactId>
+ <groupId>org.apache.tuscany.sca.aggregation</groupId>
+ <artifactId>tuscany-binding-ws-runtime-axis2-aggregation</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -211,7 +179,7 @@
<generateManifestJar>true</generateManifestJar>
<featuresName>features</featuresName>
<excludeGroupIds>
- <groupId>org.apache.tuscany.sca.shades</groupId>
+ <groupId>org.apache.tuscany.sca.aggregation</groupId>
</excludeGroupIds>
<artifactManifests>
<artifactManifest>
@@ -395,6 +363,11 @@
<version>2.0-SNAPSHOT</version>
</extension>
+ <extension>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </extension>
</extensions>
<artifactManifests>
<artifactManifest>
Modified: tuscany/sca-java-2.x/trunk/distribution/all/src/main/components/bin-lib.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/src/main/components/bin-lib.xml?rev=1005831&r1=1005830&r2=1005831&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/src/main/components/bin-lib.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/src/main/components/bin-lib.xml Fri Oct 8 13:57:43 2010
@@ -24,6 +24,20 @@
<useTransitiveDependencies>true</useTransitiveDependencies>
<unpack>false</unpack>
<includes>
+ <include>org.apache.tuscany.sca.aggregation:tuscany-base-runtime-aggregation</include>
+ <include>org.apache.tuscany.sca.aggregation:tuscany-binding-rmi-runtime-aggregation</include>
+ <include>org.apache.tuscany.sca.aggregation:tuscany-binding-ws-runtime-axis2-aggregation</include>
+ <!-- needed by some of the sample build scripts but don't think we actually need to put this here -->
+ <include>org.apache.tuscany.sca:tuscany-sca-api</include>
+ </includes>
+ </dependencySet>
+
+<!-- dependencies referring to the shade jars, disabling for the time being
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpack>false</unpack>
+ <includes>
<include>org.apache.tuscany.sca.shades:tuscany-base</include>
<include>org.apache.ws.commons.schema:XmlSchema</include>
<include>cglib:cglib</include>
@@ -42,6 +56,7 @@
<include>org.springframework:*</include>
</includes>
</dependencySet>
+-->
</dependencySets>
<fileSets>
<fileSet>