You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by as...@apache.org on 2008/11/06 10:53:37 UTC
svn commit: r711817 - in /synapse/trunk/java: ./ modules/distribution/
modules/distribution/src/ modules/distribution/src/main/
modules/distribution/src/main/assembly/
modules/distribution/src/main/release/ src/main/
Author: asankha
Date: Thu Nov 6 01:53:33 2008
New Revision: 711817
URL: http://svn.apache.org/viewvc?rev=711817&view=rev
Log:
create a new maven module distribution to build the binaries (and source when a release is near :)
Added:
synapse/trunk/java/modules/distribution/
synapse/trunk/java/modules/distribution/pom.xml
synapse/trunk/java/modules/distribution/src/
synapse/trunk/java/modules/distribution/src/main/
- copied from r711762, synapse/trunk/java/src/main/
Removed:
synapse/trunk/java/src/main/
Modified:
synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
synapse/trunk/java/modules/distribution/src/main/release/BUILDING.txt
synapse/trunk/java/pom.xml
Added: synapse/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/pom.xml?rev=711817&view=auto
==============================================================================
--- synapse/trunk/java/modules/distribution/pom.xml (added)
+++ synapse/trunk/java/modules/distribution/pom.xml Thu Nov 6 01:53:33 2008
@@ -0,0 +1,64 @@
+<!--
+ ~ Copyright (c) 2005-2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you under the Apache License,
+ ~ Version 2.0 (the "License"); you may not use this file except
+ ~ in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ ~
+ -->
+
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.synapse</groupId>
+ <artifactId>Apache-Synapse</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.synapse</groupId>
+ <artifactId>synapse-distribution</artifactId>
+
+ <name>Apache Synapse - Distribution</name>
+ <description>Apache Synapse - Distribution</description>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <!--<descriptor>src/main/assembly/src.xml</descriptor>-->
+ </descriptors>
+ <finalName>synapse-${synapse.version}</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
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=711817&r1=711762&r2=711817&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml Thu Nov 6 01:53:33 2008
@@ -21,7 +21,7 @@
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
- <format>tar.gz</format>
+ <!--<format>tar.gz</format>-->
<format>zip</format>
</formats>
@@ -54,7 +54,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>repository</directory>
+ <directory>../../repository</directory>
<outputDirectory>synapse-${synapse.version}/repository</outputDirectory>
<excludes>
<exclude>conf/axis2.xml</exclude>
@@ -63,7 +63,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>repository/conf</directory>
+ <directory>../../repository/conf</directory>
<outputDirectory>synapse-${synapse.version}/repository/conf</outputDirectory>
<includes>
<include>axis2.xml</include>
@@ -72,7 +72,7 @@
</fileSet>
<fileSet>
- <directory>repository/conf/sample/resources/misc/client</directory>
+ <directory>../../repository/conf/sample/resources/misc/client</directory>
<outputDirectory>synapse-${synapse.version}/samples/axis2Client/client_repo/conf
</outputDirectory>
<includes>
@@ -80,7 +80,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>modules/core/src/main/resources</directory>
+ <directory>../../modules/core/src/main/resources</directory>
<outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
<includes>
<include>log4j.properties</include>
@@ -102,7 +102,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>repository/conf/sample/resources/misc/server</directory>
+ <directory>../../repository/conf/sample/resources/misc/server</directory>
<outputDirectory>synapse-${synapse.version}/samples/axis2Server/repository/conf
</outputDirectory>
<includes>
@@ -110,7 +110,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>modules/mar/target</directory>
+ <directory>../../modules/mar/target</directory>
<outputDirectory>synapse-${synapse.version}/repository/modules</outputDirectory>
<includes>
<include>synapse-${synapse.version}.mar</include>
@@ -129,19 +129,19 @@
<fileMode>755</fileMode>
</fileSet>
<fileSet>
- <directory>src/site/resources/images</directory>
+ <directory>../../src/site/resources/images</directory>
<outputDirectory>synapse-${synapse.version}/docs/images</outputDirectory>
</fileSet>
<fileSet>
- <directory>src/site/resources/logos</directory>
+ <directory>../../src/site/resources/logos</directory>
<outputDirectory>synapse-${synapse.version}/docs/logos</outputDirectory>
</fileSet>
<fileSet>
- <directory>modules/samples/services</directory>
+ <directory>../../modules/samples/services</directory>
<outputDirectory>synapse-${synapse.version}/samples/axis2Server/src</outputDirectory>
</fileSet>
<fileSet>
- <directory>modules/samples/src/main/java</directory>
+ <directory>../../modules/samples/src/main/java</directory>
<outputDirectory>synapse-${synapse.version}/samples/axis2Client/src</outputDirectory>
<excludes>
<exclude>**/target</exclude>
@@ -149,7 +149,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>modules/samples/src/main/scripts</directory>
+ <directory>../../modules/samples/src/main/scripts</directory>
<outputDirectory>synapse-${synapse.version}/samples/axis2Client</outputDirectory>
<excludes>
<exclude>custom.sh</exclude>
@@ -159,7 +159,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>modules/samples/src/main/scripts</directory>
+ <directory>../../modules/samples/src/main/scripts</directory>
<outputDirectory>synapse-${synapse.version}/samples/axis2Server</outputDirectory>
<includes>
<include>axis2server.sh</include>
@@ -167,7 +167,7 @@
<fileMode>755</fileMode>
</fileSet>
<fileSet>
- <directory>modules/samples/src/main/scripts</directory>
+ <directory>../../modules/samples/src/main/scripts</directory>
<outputDirectory>synapse-${synapse.version}/samples/axis2Server</outputDirectory>
<includes>
<include>axis2server.bat</include>
@@ -197,49 +197,49 @@
<!--</fileSet>-->
<fileSet>
- <directory>modules/core/target</directory>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <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>
+ <directory>../../patches</directory>
<outputDirectory>synapse-${synapse.version}/lib/patches</outputDirectory>
<includes>
<include>*.jar</include>
@@ -249,27 +249,27 @@
</fileSets>
<files>
<file>
- <source>src/site/xdoc/Synapse_Configuration_Language.xml</source>
+ <source>../../src/site/xdoc/Synapse_Configuration_Language.xml</source>
<outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
<destName>Synapse_Configuration_Language.html</destName>
</file>
<file>
- <source>src/site/xdoc/Synapse_Samples.xml</source>
+ <source>../../src/site/xdoc/Synapse_Samples.xml</source>
<outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
<destName>Synapse_Samples.html</destName>
</file>
<file>
- <source>src/site/xdoc/Synapse_Samples_Setup.xml</source>
+ <source>../../src/site/xdoc/Synapse_Samples_Setup.xml</source>
<outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
<destName>Synapse_Samples_Setup.html</destName>
</file>
<file>
- <source>src/site/xdoc/Synapse_QuickStart.xml</source>
+ <source>../../src/site/xdoc/Synapse_QuickStart.xml</source>
<outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
<destName>Synapse_QuickStart.html</destName>
</file>
<file>
- <source>src/site/xdoc/Synapse_Extending.xml</source>
+ <source>../../src/site/xdoc/Synapse_Extending.xml</source>
<outputDirectory>synapse-${synapse.version}/docs</outputDirectory>
<destName>Synapse_Extending.html</destName>
</file>
Modified: synapse/trunk/java/modules/distribution/src/main/release/BUILDING.txt
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/release/BUILDING.txt?rev=711817&r1=711762&r2=711817&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/release/BUILDING.txt (original)
+++ synapse/trunk/java/modules/distribution/src/main/release/BUILDING.txt Thu Nov 6 01:53:33 2008
@@ -8,12 +8,6 @@
mvn clean install
-To build the Synapse distributions, first build the jars using the above and then use the following:
-
- mvn assembly:assembly -Drelease -Dmaven.test.skip
-
-This will build the source and binary distributions in the target folder created.
-
To build the site, use:
mvn site
Modified: synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=711817&r1=711816&r2=711817&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Thu Nov 6 01:53:33 2008
@@ -89,18 +89,27 @@
<id>release</id>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <finalName>synapse-${synapse.version}</finalName>
- </configuration>
- </plugin>
+ <!--<plugin>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-assembly-plugin</artifactId>-->
+ <!--<version>2.2-beta-1</version>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>distribution-package</id>-->
+ <!--<phase>package</phase>-->
+ <!--<goals>-->
+ <!--<goal>single</goal>-->
+ <!--</goals>-->
+ <!--<configuration>-->
+ <!--<descriptors>-->
+ <!--<descriptor>src/main/assembly/bin.xml</descriptor>-->
+ <!--<descriptor>src/main/assembly/src.xml</descriptor>-->
+ <!--</descriptors>-->
+ <!--<finalName>synapse-${synapse.version}</finalName>-->
+ <!--</configuration>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
<!--<plugin>-->
<!--<artifactId>maven-site-plugin</artifactId>-->
@@ -1137,6 +1146,7 @@
<module>modules/war</module>
<module>modules/handler</module>
<module>modules/xar-maven-plugin</module>
+ <module>modules/distribution</module>
</modules>
<properties>