You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ch...@apache.org on 2006/01/27 03:38:12 UTC
svn commit: r372705 - in /webservices/sandesha/trunk: maven.xml
project.properties project.xml
Author: chamikara
Date: Thu Jan 26 18:37:51 2006
New Revision: 372705
URL: http://svn.apache.org/viewcvs?rev=372705&view=rev
Log:
Updated maven files
Modified:
webservices/sandesha/trunk/maven.xml
webservices/sandesha/trunk/project.properties
webservices/sandesha/trunk/project.xml
Modified: webservices/sandesha/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/maven.xml?rev=372705&r1=372704&r2=372705&view=diff
==============================================================================
--- webservices/sandesha/trunk/maven.xml (original)
+++ webservices/sandesha/trunk/maven.xml Thu Jan 26 18:37:51 2006
@@ -14,14 +14,14 @@
<ant:property name="jar.name" value="${dist.name}.jar"/>
<ant:property name="dir.samples" value="samples"/>
<ant:property name="dir.test.resources" value="test-resources"/>
- <ant:property name="addressing.module.name" value="addressing.mar"/>
+ <ant:property name="build.addressing.mar" value="addressing.mar"/>
<ant:property name="dir.config" value="config"/>
<ant:property name="apache.license.file" value="LICENSE.txt" />
<ant:property name="readme.file" value="README.txt" />
<ant:property name="release.notes.file" value="release-notes.html" />
- <ant:property name="addressing.mar.name" value="axis2-addressing-0.95-SNAPSHOT.jar" />
- <ant:property name="addressing.mar.path" value="${maven.repo.local}/axis2/jars" />
- <ant:property name="addressing.mar" value="${addressing.mar.path}/${addressing.mar.name}" />
+ <ant:property name="repo.addressing.mar.full.name" value="${repo.addressing.mar.name}-${addressing.version}.jar" />
+ <ant:property name="repo.addressing.mar.path" value="${maven.repo.local}/axis2/jars" />
+ <ant:property name="repo.addressing.mar" value="${repo.addressing.mar.path}/${repo.addressing.mar.full.name}" />
<goal name="all" prereqs="jar,mar:create,samples:create,javadoc" />
<goal name="default">
@@ -52,7 +52,7 @@
<ant:copy file="${maven.build.dir}/${mar.name}" todir="${client.dist.path}/modules" />
<!-- Copying addressing mar file-->
- <ant:copy file="${addressing.mar}" todir="${client.dist.path}/modules" />
+ <ant:copy file="${repo.addressing.mar}" toFile="${client.dist.path}/modules/${build.addressing.mar}" />
</goal>
<goal name="repo:create">
@@ -74,7 +74,7 @@
</ant:copy>
<!-- Copying addressing mar file-->
- <ant:copy file="${addressing.mar}" todir="${server.dist.path}/modules" />
+ <ant:copy file="${repo.addressing.mar}" toFile="${server.dist.path}/modules/${build.addressing.mar}" />
</goal>
<goal name="sample:compile">
@@ -137,12 +137,6 @@
<preGoal name="test:test" >
<attainGoal name="server:create"/>
<attainGoal name="client:create"/>
-
- <!-- check for the availability of addretting module and fail if not available-->
- <!--
- <ant:copy file="${dir.test.resources}/modules/${addressing.module.name}" todir="${build.repo.dir}/server/modules"/>
- <ant:copy file="${dir.test.resources}/modules/${addressing.module.name}" todir="${build.repo.dir}/client/modules"/>
- -->
</preGoal>
<goal name="server.copy.tomcat" prereqs="server:create">
Modified: webservices/sandesha/trunk/project.properties
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/project.properties?rev=372705&r1=372704&r2=372705&view=diff
==============================================================================
--- webservices/sandesha/trunk/project.properties (original)
+++ webservices/sandesha/trunk/project.properties Thu Jan 26 18:37:51 2006
@@ -10,7 +10,6 @@
maven.repo.remote=http://www.ibiblio.org/maven/,\
http://svn.apache.org/repository/,\
http://dist.codehaus.org/,\
- http://www.apache.org/dist/java-repository/
# XDOC PLUGIN
###############
@@ -18,6 +17,9 @@
maven.xdoc.date = left
maven.xdoc.version = ${pom.currentVersion}
+current.version=0.91
maven.html2xdoc.enabled=false
maven.html2xdoc.dir=./xdocs
-axis2.version=0.95-SNAPSHOT
\ No newline at end of file
+axis2.version=0.95-SNAPSHOT
+addressing.version=0.95-SNAPSHOT
+repo.addressing.mar.name=axis2-addressing
\ No newline at end of file
Modified: webservices/sandesha/trunk/project.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/project.xml?rev=372705&r1=372704&r2=372705&view=diff
==============================================================================
--- webservices/sandesha/trunk/project.xml (original)
+++ webservices/sandesha/trunk/project.xml Thu Jan 26 18:37:51 2006
@@ -4,7 +4,7 @@
<id>sandesha2</id>
<name>Apache Sandesha2</name>
<groupId>sandesha2</groupId>
- <currentVersion>0.91-SNAPSHOT</currentVersion>
+ <currentVersion>${current.version}</currentVersion>
<organization>
<name>Apache Web Services</name>
<url>http://ws.apache.org/</url>
@@ -108,7 +108,7 @@
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-addressing</artifactId>
- <version>${axis2.version}</version>
+ <version>${addressing.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org