Author: saminda
Date: Thu Jun 8 04:49:38 2006
New Revision: 412727
URL: http://svn.apache.org/viewvc?rev=412727&view=rev
Log:
removed a confilict
Modified:
incubator/synapse/trunk/java/modules/core/maven.xml
incubator/synapse/trunk/java/project.properties
Modified: incubator/synapse/trunk/java/modules/core/maven.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/maven.xml?rev=412727&r1=412726&r2=412727&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/maven.xml (original)
+++ incubator/synapse/trunk/java/modules/core/maven.xml Thu Jun 8 04:49:38 2006
@@ -33,20 +33,16 @@
<echo message="-----------Creating Server Repository ----------"/>
- <mkdir dir="target/synapse-repository"/>
+ <mkdir dir="target/synapse-repository/modules"/>
<copy file="target/synapse-${pom.currentVersion}.mar"
tofile="target/synapse-repository/modules/synapse-${pom.currentVersion}.mar"/>
- <mkdir dir="target/synapse-repository/modules"/>
-<<<<<<< .mine
- <copy
file="${maven.repo.local}/axis2/mars/addressing-${addressing.version}.mar"
-=======
+
<copy file="target/lib/addressing-${addressing.version}.mar"
->>>>>>> .r412721
tofile="target/synapse-repository/modules/addressing-${addressing.version}.mar"/>
- <copy
file="${maven.repo.local}/sandesha2/mars/sandesha2-${sandesha2.version}.mar"
+ <copy file="target/lib/sandesha2-${sandesha2.version}.mar"
tofile="target/synapse-repository/modules/sandesha2-${sandesha2.version}.mar"/>
- <copy
file="${maven.repo.local}/axis2/mars/rampart-${rampart.version}.mar"
+ <copy file="target/lib/rampart-${rampart.version}.mar"
tofile="target/synapse-repository/modules/rampart-${rampart.version}.mar"/>
<copy todir="target/synapse-repository/conf">
@@ -57,21 +53,15 @@
<echo message="-----------Creating Testing Repository
[testing_repository] ----------"/>
- <mkdir dir="target/testing_repository"/>
+ <mkdir dir="target/testing_repository/modules"/>
+
<copy file="target/synapse-${pom.currentVersion}.mar"
tofile="target/testing_repository/modules/synapse-${pom.currentVersion}.mar"/>
-
-<<<<<<< .mine
- <mkdir dir="target/synapse-repository/modules"/>
- <copy
file="${maven.repo.local}/axis2/mars/addressing-${addressing.version}.mar"
-=======
- <mkdir dir="target/testing_repository/modules"/>
<copy file="target/lib/addressing-${addressing.version}.mar"
->>>>>>> .r412721
tofile="target/testing_repository/modules/addressing-${addressing.version}.mar"/>
- <copy
file="${maven.repo.local}/sandesha2/mars/sandesha2-${sandesha2.version}.mar"
+ <copy file="target/lib/sandesha2-${sandesha2.version}.mar"
tofile="target/testing_repository/modules/sandesha2-${sandesha2.version}.mar"/>
- <copy
file="${maven.repo.local}/axis2/mars/rampart-${rampart.version}.mar"
+ <copy file="target/lib/rampart-${rampart.version}.mar"
tofile="target/testing_repository/modules/rampart-${rampart.version}.mar"/>
<copy file="../../repository/conf/axis2.xml"
Modified: incubator/synapse/trunk/java/project.properties
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/project.properties?rev=412727&r1=412726&r2=412727&view=diff
==============================================================================
--- incubator/synapse/trunk/java/project.properties (original)
+++ incubator/synapse/trunk/java/project.properties Thu Jun 8 04:49:38 2006
@@ -100,7 +100,7 @@
# -------------------------------------------------------------------
# Rampart Version
# -------------------------------------------------------------------
-rampart.version=1.031
+rampart.version=1.0
# -------------------------------------------------------------------
# Synapse Version
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
