You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by sa...@apache.org on 2006/05/31 07:29:17 UTC
svn commit: r410433 - in /incubator/synapse/trunk/java:
etc/project.properties maven.xml modules/core/conf/module.xml
modules/core/maven.xml
Author: saminda
Date: Tue May 30 22:29:17 2006
New Revision: 410433
URL: http://svn.apache.org/viewvc?rev=410433&view=rev
Log:
1. change maven.xml to copy core module classes
2. copy the synapse.mar to dist dir
3. change the synpase.version to be SNAPSHOT
4. SynapseDispatcher moves to the last position of the dispatching chain. This has been done, inorder to mave wsdl
mediation work, without any problem.
Modified:
incubator/synapse/trunk/java/etc/project.properties
incubator/synapse/trunk/java/maven.xml
incubator/synapse/trunk/java/modules/core/conf/module.xml
incubator/synapse/trunk/java/modules/core/maven.xml
Modified: incubator/synapse/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/etc/project.properties?rev=410433&r1=410432&r2=410433&view=diff
==============================================================================
--- incubator/synapse/trunk/java/etc/project.properties (original)
+++ incubator/synapse/trunk/java/etc/project.properties Tue May 30 22:29:17 2006
@@ -70,7 +70,6 @@
geronimo.spec.jms.version=1.1-rc4
backport_util_concurrent.version=2.1
spring.version=1.2.6
-synapse.version=M2
xml_apis.version=1.3.03
@@ -90,3 +89,9 @@
# Addressing Version
# -------------------------------------------------------------------
addressing.version=1.0
+
+# -------------------------------------------------------------------
+# Synapse Version
+# -------------------------------------------------------------------
+
+synapse.version=SNAPSHOT
Modified: incubator/synapse/trunk/java/maven.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/maven.xml?rev=410433&r1=410432&r2=410433&view=diff
==============================================================================
--- incubator/synapse/trunk/java/maven.xml (original)
+++ incubator/synapse/trunk/java/maven.xml Tue May 30 22:29:17 2006
@@ -381,6 +381,11 @@
</ant:fileset>
</ant:copy>
+ <ant:copy file="modules/core/target/synapse-${pom.currentVersion}.mar"
+ tofile="${dist.dir}/synapse-${pom.currentVersion}.mar"/>
+ <ant:copy file="modules/core/target/synapse-${pom.currentVersion}.mar"
+ tofile="target/synapse-${pom.currentVersion}.mar"/>
+
<ant:zip file="${dist.dir}/${dist.name}-bin.zip"
basedir="target/temp"/>
Modified: incubator/synapse/trunk/java/modules/core/conf/module.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/conf/module.xml?rev=410433&r1=410432&r2=410433&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/conf/module.xml (original)
+++ incubator/synapse/trunk/java/modules/core/conf/module.xml Tue May 30 22:29:17 2006
@@ -8,7 +8,7 @@
<inflow>
<handler name="SynapseDispatcher"
class="org.apache.synapse.core.axis2.SynapseDispatcher">
- <order phaseFirst="true" phase="Dispatch"/>
+ <order phaseLast="true" phase="Dispatch"/>
</handler>
</inflow>
Modified: incubator/synapse/trunk/java/modules/core/maven.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/maven.xml?rev=410433&r1=410432&r2=410433&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/maven.xml (original)
+++ incubator/synapse/trunk/java/modules/core/maven.xml Tue May 30 22:29:17 2006
@@ -24,16 +24,23 @@
<mkdir dir="target/modules/synapse/META-INF"/>
<copy file="conf/module.xml"
tofile="target/modules/synapse/META-INF/module.xml"/>
- <jar jarfile="target/synapse.mar"
- basedir="target/modules/synapse">
- <include name="**"/>
+ <jar jarfile="target/synapse-${pom.currentVersion}.mar">
+ <fileset dir="target/modules/synapse">
+ <include name="**"/>
+ </fileset>
+ <fileset dir="target/classes">
+ <include name="**"/>
+ </fileset>
+
</jar>
+ <copy file="target/synapse-${pom.currentVersion}.mar"
+ tofile="${maven.repo.local}/${pom.artifactId}/mars/synapse-${pom.currentVersion}.mar"/>
<echo message="-----------Creating Testing Repository - Genral----------"/>
<mkdir dir="target/synapse-repository"/>
- <copy file="target/synapse.mar"
- tofile="target/synapse-repository/modules/synapse.mar"/>
+ <copy file="target/synapse-${pom.currentVersion}.mar"
+ tofile="target/synapse-repository/modules/synapse-${pom.currentVersion}.mar"/>
<mkdir dir="target/synapse-repository/modules"/>
<copy file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository/modules/addressing-${addressing.version}.mar"/>
@@ -45,7 +52,6 @@
<ant:delete dir="target/modules"/>
<ant:delete dir="target/services"/>
- <ant:delete file="target/synapse.mar"/>
<ant:path id="classes_test.dir" location="${class_test.dir}"/>
<maven:addPath id="maven.dependency.classpath" refid="classes_test.dir"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org