Author: saminda
Date: Mon Jun 5 03:28:26 2006
New Revision: 411731
URL: http://svn.apache.org/viewvc?rev=411731&view=rev
Log:
Removed addressing.mar outof svn and allowed it download to download maven repo
dependency change for axiom-api and impl.
Removed:
incubator/synapse/trunk/java/repository/modules/
Modified:
incubator/synapse/trunk/java/maven.xml
incubator/synapse/trunk/java/modules/core/maven.xml
incubator/synapse/trunk/java/modules/core/project.xml
incubator/synapse/trunk/java/project.xml
Modified: incubator/synapse/trunk/java/maven.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/maven.xml?rev=411731&r1=411730&r2=411731&view=diff
==============================================================================
--- incubator/synapse/trunk/java/maven.xml (original)
+++ incubator/synapse/trunk/java/maven.xml Mon Jun 5 03:28:26 2006
@@ -268,6 +268,8 @@
</srcfiles>
</uptodate>
<echo message="the files are up to date = ${jars.uptodate}"></echo>
+ <!-- Creating libs-->
+ <deploy:copy-deps todir="target/lib"/>
</goal>
<goal name="modules:clean">
@@ -301,6 +303,7 @@
<ant:echo>+----------------------------------------</ant:echo>
<ant:delete dir="modules/extensions/logs"/>
<ant:delete dir="modules/core/logs"/>
+ <ant:delete file="velocity.log"/>
</goal>
<goal name="clean">
@@ -348,7 +351,7 @@
<!-- ================================================================ -->
<!--- Create the Distro -->
<!-- ================================================================ -->
- <goal name="dist-bin" prereqs="war,create-jar,javadocs">
+ <goal name="dist-bin" prereqs="init,war,create-jar,javadocs">
<ant:echo>+----------------------------------------------</ant:echo>
<ant:echo>| Creating: Synapse Binary Distribution</ant:echo>
<ant:echo>+----------------------------------------------</ant:echo>
@@ -656,12 +659,12 @@
</define:tag>
</define:taglib>
- <goal name="war" prereqs="init">
+ <goal name="war">
<j:if test="${jars.uptodate != 'yes'}">
<attainGoal name="jar"/>
</j:if>
<!-- jar the test classes -->
- <deploy:copy-deps todir="target/lib"/>
+ <!--<deploy:copy-deps todir="target/lib"/>-->
<ant:war destfile="target/synapse.war" webxml="bin/web.xml">
<ant:lib dir="target/lib">
<ant:include name="**"/>
Modified: incubator/synapse/trunk/java/modules/core/maven.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/maven.xml?rev=411731&r1=411730&r2=411731&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/maven.xml (original)
+++ incubator/synapse/trunk/java/modules/core/maven.xml Mon Jun 5 03:28:26 2006
@@ -9,12 +9,9 @@
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
<postGoal name="test:compile">
- <mkdir dir="target/repository"/>
- <ant:copy todir="target/repository">
- <ant:fileset dir="../../repository">
- <ant:include name="**"/>
- </ant:fileset>
- </ant:copy>
+
+ <!--Creating the libs dir-->
+ <deploy:copy-deps todir="target/lib"/>
<attainGoal name="synapse_core"/>
</postGoal>
<goal name="synapse_core">
@@ -42,7 +39,7 @@
<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"
+ <copy file="target/lib/addressing-${addressing.version}.mar"
tofile="target/synapse-repository/modules/addressing-${addressing.version}.mar"/>
<copy todir="target/synapse-repository/conf">
<fileset dir="../../repository/conf">
@@ -57,7 +54,7 @@
tofile="target/testing_repository/modules/synapse-${pom.currentVersion}.mar"/>
<mkdir dir="target/testing_repository/modules"/>
- <copy
file="../../repository/modules/addressing-${addressing.version}.mar"
+ <copy file="target/lib/addressing-${addressing.version}.mar"
tofile="target/testing_repository/modules/addressing-${addressing.version}.mar"/>
<copy file="../../repository/conf/axis2.xml"
tofile="target/testing_repository/conf/axis2.xml"/>
Modified: incubator/synapse/trunk/java/modules/core/project.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/project.xml?rev=411731&r1=411730&r2=411731&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/project.xml (original)
+++ incubator/synapse/trunk/java/modules/core/project.xml Mon Jun 5 03:28:26
2006
@@ -13,7 +13,14 @@
<!-- Dependencies -->
<!-- ============ -->
- <dependencies/>
+ <dependencies>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>addressing</artifactId>
+ <version>${addressing.version}</version>
+ <type>mar</type>
+ </dependency>
+ </dependencies>
<build>
<nagEmailAddress>[email protected]</nagEmailAddress>
Modified: incubator/synapse/trunk/java/project.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/project.xml?rev=411731&r1=411730&r2=411731&view=diff
==============================================================================
--- incubator/synapse/trunk/java/project.xml (original)
+++ incubator/synapse/trunk/java/project.xml Mon Jun 5 03:28:26 2006
@@ -56,16 +56,17 @@
<artifactId>axis2</artifactId>
<version>${axis2.version}</version>
</dependency>
-
<dependency>
<groupId>ws-commons</groupId>
- <artifactId>axiom</artifactId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom-impl</artifactId>
<version>${axiom.version}</version>
- <properties>
- <module>false</module>
- </properties>
</dependency>
-
+
<dependency>
<groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
