You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ch...@apache.org on 2006/10/25 06:15:07 UTC
svn commit: r467557 - in /webservices/sandesha/trunk/java: maven.xml
project.properties project.xml
Author: chamikara
Date: Tue Oct 24 21:15:06 2006
New Revision: 467557
URL: http://svn.apache.org/viewvc?view=rev&rev=467557
Log:
Changing things back to trunk with some other corrections.
Sorry abt the delay guys.
Modified:
webservices/sandesha/trunk/java/maven.xml
webservices/sandesha/trunk/java/project.properties
webservices/sandesha/trunk/java/project.xml
Modified: webservices/sandesha/trunk/java/maven.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/maven.xml?view=diff&rev=467557&r1=467556&r2=467557
==============================================================================
--- webservices/sandesha/trunk/java/maven.xml (original)
+++ webservices/sandesha/trunk/java/maven.xml Tue Oct 24 21:15:06 2006
@@ -30,10 +30,10 @@
<ant:property name="release.notes.file" value="release-notes.html" />
<ant:property name="repo.addressing.mar.full.name" value="${repo.addressing.mar.name}-${addressing.version}.mar" />
- <ant:property name="repo.addressing.mar.path" value="${maven.repo.local}/org.apache.axis2/mars" />
+ <ant:property name="repo.addressing.mar.path" value="${maven.repo.local}/${axis2.mar.groupid}/mars" />
<ant:property name="repo.addressing.mar" value="${repo.addressing.mar.path}/${repo.addressing.mar.full.name}" />
- <ant:property name="repo.rampart.mar" value="${maven.repo.local}/org.apache.axis2/mars/rampart-${rampart.version}.mar" />
- <ant:property name="repo.rahas.mar" value="${maven.repo.local}/org.apache.axis2/mars/rahas-${rahas.version}.mar" />
+ <ant:property name="repo.rampart.mar" value="${maven.repo.local}/${axis2.mar.groupid}/mars/rampart-${rampart.version}.mar" />
+ <ant:property name="repo.rahas.mar" value="${maven.repo.local}/${axis2.mar.groupid}/mars/rahas-${rahas.version}.mar" />
<goal name="build:all" prereqs="mar,jar,client:jar,policy:jar,sample:create,repo:create,test:test" />
Modified: webservices/sandesha/trunk/java/project.properties
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.properties?view=diff&rev=467557&r1=467556&r2=467557
==============================================================================
--- webservices/sandesha/trunk/java/project.properties (original)
+++ webservices/sandesha/trunk/java/project.properties Tue Oct 24 21:15:06 2006
@@ -1,4 +1,4 @@
-# -----------------------------------------------------------------------------
+ # -----------------------------------------------------------------------------
# Default properties for the Maven build. You can override these properties
# either by defining a build.properties file with the overriden properties
# or by passing them on the command line as system parameters (-D).
@@ -18,38 +18,45 @@
maven.xdoc.date = left
maven.xdoc.version = ${pom.currentVersion}
+maven.html2xdoc.enabled=false
+maven.html2xdoc.dir=./xdocs
+
+
sandesha2.version=SNAPSHOT
sandesha2.module.version=SNAPSHOT
-maven.html2xdoc.enabled=false
-maven.html2xdoc.dir=./xdocs
+axis2.version=SNAPSHOT
+axiom.version=SNAPSHOT
+
+addressing.version=${axis2.version}
+rampart.version=${axis2.version}
+rahas.version=${axis2.version}
+axis2.security.version=${axis2.version}
+axis2.rahas.version=${axis2.version}
+axis2.secpolicy.version=${axis2.version}
+
+neethi.version=SNAPSHOT
+XmlSchema.version=SNAPSHOT
+wss4j.version=SNAPSHOT
annogen.version=0.1.0
backport_util_concurrent.version=2.1
-addressing.version=1.1-SNAPSHOT
-rampart.version=1.1-SNAPSHOT
-rahas.version=1.1-SNAPSHOT
-axiom.version=SNAPSHOT
-axis2.version=1.1-SNAPSHOT
commons.codec.version=1.3
commons.httpclient.version=3.0
commons.logging.version=1.0.4
log4j.version=1.2.13
-neethi.version=SNAPSHOT
stax.api.version=1.0.1
stax.impl.groupid=woodstox
stax.impl.artifactid=wstx
stax.impl.version=asl-3.0.0
wsdl4j.version=1.5.2
-XmlSchema.version=SNAPSHOT
jakarta.httpcore.version=4.0-alpha2
geronimo.spec.activation.version=1.0.2-rc4
geronimo.spec.javamail.version=1.3.1-rc5
-axis2.security.version=1.1-SNAPSHOT
-axis2.rahas.version=1.1-SNAPSHOT
-axis2.secpolicy.version=1.1-SNAPSHOT
-wss4j.version=SNAPSHOT
xmlsec.version=1.3.0
bcprov.version=jdk13-133
repo.addressing.mar.name=addressing
+
+axis2.jar.groupid=org.apache.axis2
+axis2.mar.groupid=axis2
Modified: webservices/sandesha/trunk/java/project.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.xml?view=diff&rev=467557&r1=467556&r2=467557
==============================================================================
--- webservices/sandesha/trunk/java/project.xml (original)
+++ webservices/sandesha/trunk/java/project.xml Tue Oct 24 21:15:06 2006
@@ -105,24 +105,24 @@
<dependencies>
<dependency>
- <groupId>org.apache.axis2</groupId>
+ <groupId>${axis2.jar.groupid}</groupId>
<artifactId>axis2</artifactId>
<version>${axis2.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
+ <groupId>${axis2.mar.groupid}</groupId>
<artifactId>addressing</artifactId>
<version>${addressing.version}</version>
<type>mar</type>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
+ <groupId>${axis2.mar.groupid}</groupId>
<artifactId>rampart</artifactId>
<version>${rampart.version}</version>
<type>mar</type>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
+ <groupId>${axis2.mar.groupid}</groupId>
<artifactId>rahas</artifactId>
<version>${rahas.version}</version>
<type>mar</type>
@@ -168,27 +168,27 @@
<version>${wsdl4j.version}</version>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons.neethi</groupId>
<artifactId>neethi</artifactId>
<version>${neethi.version}</version>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
<version>${axiom.version}</version>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
<version>${axiom.version}</version>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
+ <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
<version>${axiom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
<version>${XmlSchema.version}</version>
</dependency>
@@ -213,17 +213,17 @@
<version>${geronimo.spec.javamail.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
+ <groupId>${axis2.jar.groupid}</groupId>
<artifactId>axis2-security</artifactId>
<version>${axis2.security.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
+ <groupId>${axis2.jar.groupid}</groupId>
<artifactId>axis2-rahas</artifactId>
<version>${axis2.rahas.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
+ <groupId>${axis2.jar.groupid}</groupId>
<artifactId>axis2-secpolicy</artifactId>
<version>${axis2.secpolicy.version}</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org