You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2008/12/30 17:57:46 UTC

svn commit: r730179 - in /synapse/trunk/java/modules/distribution: pom.xml src/main/assembly/bin.xml

Author: veithen
Date: Tue Dec 30 08:57:46 2008
New Revision: 730179

URL: http://svn.apache.org/viewvc?rev=730179&view=rev
Log:
Fixed Synapse distribution assembly.

Modified:
    synapse/trunk/java/modules/distribution/pom.xml
    synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml

Modified: synapse/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/pom.xml?rev=730179&r1=730178&r2=730179&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/pom.xml (original)
+++ synapse/trunk/java/modules/distribution/pom.xml Tue Dec 30 08:57:46 2008
@@ -35,6 +35,18 @@
     <name>Apache Synapse - Distribution</name>
     <description>Apache Synapse - Distribution</description>
     <packaging>pom</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.synapse</groupId>
+            <artifactId>synapse-extensions</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.synapse</groupId>
+            <artifactId>synapse-samples</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>

Modified: synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml?rev=730179&r1=730178&r2=730179&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml Tue Dec 30 08:57:46 2008
@@ -197,48 +197,6 @@
         <!--</fileSet>-->
 
         <fileSet>
-            <directory>../../modules/core/target</directory>
-            <outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
-            <includes>
-                <include>synapse-core-${synapse.version}.jar</include>
-            </includes>
-        </fileSet> 
-        <fileSet>
-            <directory>../../modules/utils/target</directory>
-            <outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
-            <includes>
-                <include>synapse-utils-${synapse.version}.jar</include>
-            </includes>
-        </fileSet> 
-        <fileSet>
-            <directory>../../modules/tasks/target</directory>
-            <outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
-            <includes>
-                <include>synapse-tasks-${synapse.version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/samples/target</directory>
-            <outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
-            <includes>
-                <include>synapse-samples-${synapse.version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/extensions/target</directory>
-            <outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
-            <includes>
-                <include>synapse-extensions-${synapse.version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/transports/target</directory>
-            <outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
-            <includes>
-                <include>synapse-transports-${synapse.version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
             <directory>../../patches</directory>
             <outputDirectory>synapse-${synapse.version}/lib/patches</outputDirectory>
             <includes>
@@ -276,6 +234,7 @@
     </files>
     <dependencySets>
         <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
             <excludes>
                 <exclude>tomcat:catalina:jar</exclude>
@@ -324,6 +283,7 @@
             </excludes>
         </dependencySet>
         <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>synapse-${synapse.version}/lib/endorsed</outputDirectory>
             <includes>
                 <include>xml-apis:xml-apis:jar</include>
@@ -331,6 +291,7 @@
             </includes>
         </dependencySet>
         <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>synapse-${synapse.version}/repository/modules</outputDirectory>
             <includes>
                 <include>org.apache.axis2:addressing:mar</include>
@@ -340,6 +301,7 @@
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
         </dependencySet>
         <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>synapse-${synapse.version}/samples/axis2Client/client_repo/modules
             </outputDirectory>
             <includes>
@@ -350,6 +312,7 @@
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
         </dependencySet>
         <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>synapse-${synapse.version}/samples/axis2Server/repository/modules
             </outputDirectory>
             <includes>