Author: ruwan
Date: Sat Jul 12 06:37:03 2008
New Revision: 676178
URL: http://svn.apache.org/viewvc?rev=676178&view=rev
Log:
Fixing an issue in the synapse.mar generation, earlier it has been done in the
core module and then has been copied to the mar module which is wrong IMO and
hence changed it to build the mar first and then build the core. This can be
done because there are no sources in the mar and it is just a module.xml.
Further it is required to build the mar first because when building core the
generated mar is required to run the code tests.
Added:
synapse/trunk/java/modules/mar/src/main/resources/META-INF/module.xml
- copied unchanged from r673972,
synapse/trunk/java/modules/core/src/main/resources/module.xml
Removed:
synapse/trunk/java/modules/core/src/main/resources/module.xml
Modified:
synapse/trunk/java/modules/core/pom.xml
synapse/trunk/java/modules/mar/pom.xml
synapse/trunk/java/pom.xml
synapse/trunk/java/src/main/assembly/bin.xml
Modified: synapse/trunk/java/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/pom.xml?rev=676178&r1=676177&r2=676178&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/pom.xml (original)
+++ synapse/trunk/java/modules/core/pom.xml Sat Jul 12 06:37:03 2008
@@ -85,31 +85,7 @@
<mkdir
dir="target/test_repos/synapse/services"/>
<mkdir dir="target/test_repos/client/modules"/>
- <echo message="*** Creating synapse.mar ***"/>
- <mkdir dir="target/modules/synapse/META-INF"/>
- <copy file="src/main/resources/module.xml"
tofile="target/modules/synapse/META-INF/module.xml"/>
-
- <manifest file="target/MANIFEST.MF">
- <attribute name="Extension-Name"
value="org.apache.synapse"/>
- <attribute name="Specification-Title"
value="synapse"/>
- <attribute name="Specification-Vendor"
value="Apache Software Foundation"/>
- <attribute name="Specification-Version"
value="${pom.version}"/>
- <attribute name="Implementation-Title"
value="Apache Synapse"/>
- <attribute name="Implementation-Vendor-Id"
value="org.apache"/>
- <attribute name="Implementation-Vendor"
value="Apache Software Foundation"/>
- <attribute name="Implementation-Version"
value="${pom.version}"/>
- </manifest>
-
- <jar jarfile="target/synapse-${version}.mar"
manifest="target/MANIFEST.MF">
- <fileset dir="target/modules/synapse">
- <include name="**"/>
- </fileset>
- <!--<fileset dir="target/classes">
- <include name="**"/>
- </fileset>-->
- </jar>
-
- <copy file="target/synapse-${version}.mar"
+ <copy
file="../mar/target/synapse-${version}.mar"
tofile="target/test_repos/synapse/modules/synapse-${version}.mar"/>
</tasks>
Modified: synapse/trunk/java/modules/mar/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/mar/pom.xml?rev=676178&r1=676177&r2=676178&view=diff
==============================================================================
--- synapse/trunk/java/modules/mar/pom.xml (original)
+++ synapse/trunk/java/modules/mar/pom.xml Sat Jul 12 06:37:03 2008
@@ -35,13 +35,51 @@
<name>Apache Synapse - Module</name>
<description>Apache Synapse - Module</description>
- <packaging>pom</packaging>
+ <packaging>bundle</packaging>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Version>1.3.0</Bundle-Version>
+ <Bundle-Name>org.apache.synapse.module</Bundle-Name>
+ <Bundle-Vendor>Apache Software
Foundation</Bundle-Vendor>
+
<Bundle-Description>${pom.description}</Bundle-Description>
+
<Bundle-SymbolicName>org.apache.synapse.module</Bundle-SymbolicName>
+ <Export-Package>
+ !*,
+ </Export-Package>
+ <Import-Package>
+ org.apache.axiom.attachments,
+ org.apache.axiom.soap,
+ org.apache.axis2,
+ org.apache.axis2.addressing,
+ org.apache.axis2.context,
+ org.apache.axis2.description,
+ org.apache.axis2.engine,
+ org.apache.axis2.handlers,
+ org.apache.axis2.modules,
+ org.apache.commons.logging,
+ org.apache.neethi,
+ org.apache.synapse,
+ org.apache.synapse.config,
+ org.apache.synapse.core,
+ org.apache.synapse.core.axis2,
+ org.apache.synapse.util,
+ *;resolution:=optional,
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
@@ -51,7 +89,8 @@
<phase>package</phase>
<configuration>
<tasks>
- <copy
file="../core/target/synapse-${synapse.version}.mar"
tofile="target/synapse-${synapse.version}.mar"/>
+ <copy
file="target/synapse-${synapse.version}.jar"
+
tofile="target/synapse-${synapse.version}.mar"/>
</tasks>
</configuration>
<goals>
Modified: synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=676178&r1=676177&r2=676178&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Sat Jul 12 06:37:03 2008
@@ -1101,10 +1101,10 @@
<modules>
<module>modules/transports</module>
+ <module>modules/mar</module>
<module>modules/core</module>
<module>modules/extensions</module>
<module>modules/samples</module>
- <module>modules/mar</module>
<module>modules/war</module>
<module>modules/handler</module>
<module>modules/xar-maven-plugin</module>
Modified: synapse/trunk/java/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/src/main/assembly/bin.xml?rev=676178&r1=676177&r2=676178&view=diff
==============================================================================
--- synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ synapse/trunk/java/src/main/assembly/bin.xml Sat Jul 12 06:37:03 2008
@@ -110,7 +110,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>modules/core/target</directory>
+ <directory>modules/mar/target</directory>
<outputDirectory>synapse-${synapse.version}/repository/modules</outputDirectory>
<includes>
<include>synapse-${synapse.version}.mar</include>
