You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2006/01/25 14:31:46 UTC
svn commit: r372208 - in /webservices/axis2/trunk/java: ./ etc/
modules/addressing/
modules/addressing/test/org/apache/axis2/handlers/addressing/
modules/core/src/org/apache/axis2/client/ modules/integration/
modules/integration/test/org/apache/axis2/i...
Author: chinthaka
Date: Wed Jan 25 05:31:09 2006
New Revision: 372208
URL: http://svn.apache.org/viewcvs?rev=372208&view=rev
Log:
Introducing version to addressing
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/maven.xml
webservices/axis2/trunk/java/modules/addressing/maven.xml
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
webservices/axis2/trunk/java/modules/saaj/maven.xml
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
webservices/axis2/trunk/java/modules/samples/maven.xml
webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=372208&r1=372207&r2=372208&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Wed Jan 25 05:31:09 2006
@@ -19,6 +19,8 @@
# Project Information
# -------------------------------------------------------------------
axis2_version=0.95-SNAPSHOT
+addressing_version=SNAPSHOT-0.95
+security_version=SNAPSHOT-0.95
release_date=January 11, 2006
Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/maven.xml?rev=372208&r1=372207&r2=372208&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Wed Jan 25 05:31:09 2006
@@ -345,7 +345,7 @@
<fileset dir="modules/codegen/target/classes"/>
<fileset dir="modules/adb/target/classes"/>
<fileset dir="modules/addressing/target/">
- <include name="modules/addressing.mar"/>
+ <include name="modules/addressing-${addressing_version}.mar"/>
</fileset>
</jar>
</goal>
@@ -389,7 +389,7 @@
<!-- copy the addressing mar -->
<ant:copy toDir="target/temp/war/toWEB-INF/modules">
- <ant:fileset file="modules/addressing/target/addressing.mar"/>
+ <ant:fileset file="modules/addressing/target/addressing-${addressing_version}.mar"/>
</ant:copy>
<!-- copy the sample services -->
@@ -445,8 +445,8 @@
<ant:echo>| Creating: Axis2 Distributions</ant:echo>
<ant:echo>+----------------------------------------------</ant:echo>
- <ant:copy toFile="target/dist/addressing-${pom.currentVersion}.mar"
- file="modules/addressing/target/addressing.mar"/>
+ <ant:copy toFile="target/dist/addressing-${addressing_version}.mar"
+ file="modules/addressing/target/addressing-${addressing_version}.mar"/>
<ant:copy toFile="target/dist/security-${pom.currentVersion}.mar"
file="modules/security/target/security.mar"/>
@@ -612,7 +612,7 @@
<!-- Copy addressing mar -->
<ant:copy toDir="${std.bin.temp.dir}/modules">
- <ant:fileset file="modules/addressing/target/addressing.mar"/>
+ <ant:fileset file="modules/addressing/target/addressing-${addressing_version}.mar"/>
</ant:copy>
<!-- Copy the codegen jar -->
Modified: webservices/axis2/trunk/java/modules/addressing/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/maven.xml?rev=372208&r1=372207&r2=372208&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/maven.xml Wed Jan 25 05:31:09 2006
@@ -15,11 +15,11 @@
<copy file="./test-resources/axis2.xml"
tofile="target/axis2.xml"/>
<mkdir dir="target/modules"/>
- <jar jarfile="target/addressing.mar" basedir="target/classes">
+ <jar jarfile="target/addressing-${addressing_version}.mar" basedir="target/classes">
<include name="**"/>
</jar>
- <copy file="target/addressing.mar"
- tofile="target/modules/addressing.mar"/>
+ <copy file="target/addressing-${addressing_version}.mar"
+ tofile="target/modules/addressing-${addressing_version}.mar"/>
</postGoal>
<preGoal name="itest:compile">
<u:file var="file" name="${maven.itest.src}"/>
Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java?rev=372208&r1=372207&r2=372208&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java Wed Jan 25 05:31:09 2006
@@ -37,7 +37,7 @@
public void testExtractAddressingInformationFromHeaders() throws AxisFault {
AxisConfiguration er = ConfigurationContextFactory.createConfigurationContextFromFileSystem("target", null)
.getAxisConfiguration();
- File file = new File("target/addressing.mar");
+ File file = new File("target/addressing-SNAPSHOT-0.95.mar");
assertTrue(file.exists());
AxisModule axisModule = er.getModule(new QName("addressing"));
assertNotNull(axisModule);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java?rev=372208&r1=372207&r2=372208&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java Wed Jan 25 05:31:09 2006
@@ -117,49 +117,49 @@
public String getAction() {
if (action == null && parent != null) {
- action = parent.getAction();
+ return parent.getAction();
}
return action;
}
public EndpointReference getFaultTo() {
if (faultTo == null && parent != null) {
- faultTo = parent.getFaultTo();
+ return parent.getFaultTo();
}
return faultTo;
}
public EndpointReference getFrom() {
if (from == null && parent != null) {
- from = parent.getFrom();
+ return parent.getFrom();
}
return from;
}
public TransportListener getListener() {
if (listener == null && parent != null) {
- listener = parent.getListener();
+ return parent.getListener();
}
return listener;
}
public TransportInDescription getTransportIn() {
if (transportIn == null && parent != null) {
- transportIn = parent.getTransportIn();
+ return parent.getTransportIn();
}
return transportIn;
}
public String getTransportInProtocol() {
if (transportInProtocol == null && parent != null) {
- transportInProtocol = parent.getTransportInProtocol();
+ return parent.getTransportInProtocol();
}
return transportInProtocol;
}
public String getMessageId() {
if (messageId == null && parent != null) {
- messageId = parent.getMessageId();
+ return parent.getMessageId();
}
return messageId;
@@ -192,21 +192,21 @@
public RelatesTo getRelatesTo() {
if (relatesTo == null && parent != null) {
- relatesTo = parent.getRelatesTo();
+ return parent.getRelatesTo();
}
return relatesTo;
}
public EndpointReference getReplyTo() {
if (replyTo == null && parent != null) {
- replyTo = parent.getReplyTo();
+ return parent.getReplyTo();
}
return replyTo;
}
public TransportOutDescription getTranportOut() {
if (transportOut == null && parent != null) {
- transportOut = parent.getTranportOut();
+ return parent.getTranportOut();
}
return transportOut;
@@ -214,7 +214,7 @@
public String getSenderTransportProtocol() {
if (senderTransportProtocol == null && parent != null) {
- senderTransportProtocol = parent.getSenderTransportProtocol();
+ return parent.getSenderTransportProtocol();
}
return senderTransportProtocol;
@@ -230,7 +230,7 @@
public String getSoapVersionURI() {
if (soapVersionURI == null && parent != null) {
- soapVersionURI = parent.getSoapVersionURI();
+ return parent.getSoapVersionURI();
}
return soapVersionURI == null ? SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI
@@ -245,7 +245,7 @@
*/
public long getTimeOutInMilliSeconds() {
if (timeOutInMilliSeconds == -1 && parent != null) {
- timeOutInMilliSeconds = parent.getTimeOutInMilliSeconds();
+ return parent.getTimeOutInMilliSeconds();
}
return timeOutInMilliSeconds == -1 ? DEFAULT_TIMEOUT_MILLISECONDS
@@ -254,7 +254,7 @@
public EndpointReference getTo() {
if (to == null && parent != null) {
- to = parent.getTo();
+ return parent.getTo();
}
return to;
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=372208&r1=372207&r2=372208&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Wed Jan 25 05:31:09 2006
@@ -12,8 +12,8 @@
<postGoal name="itest:compile">
<mkdir dir="target/itest-classes/modules"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/itest-classes/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/itest-classes/modules/addressing-${addressing_version}.mar"/>
</postGoal>
<preGoal name="test:compile">
@@ -21,8 +21,8 @@
<ant:property name="maven.class.path" refid="maven.dependency.classpath"/>
<!-- copy the mars so that they are available on the test classpath -->
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-classes/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/test-classes/modules/addressing-${addressing_version}.mar"/>
<copy file="../security/target/security.mar"
tofile="target/test-classes/modules/security.mar"/>
@@ -68,12 +68,12 @@
<mkdir dir="target/test-resources/samples/conf"/>
<mkdir dir="target/test-resources/repository-client/modules"/>
<mkdir dir="target/test-resources/repository-client/conf"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/samples/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/test-resources/samples/modules/addressing-${addressing_version}.mar"/>
<copy file="../core/conf/axis2.xml"
tofile="target/test-resources/samples/conf/axis2.xml"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/repository-client/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/test-resources/repository-client/modules/addressing-${addressing_version}.mar"/>
<copy file="../core/conf/axis2.xml"
tofile="target/test-resources/repository-client/conf/axis2.xml"/>
<mkdir dir="target/toWar/services/"/>
@@ -96,8 +96,8 @@
<mkdir dir="target/test-resources/mail-transport-client-enabledRepository/modules"/>
<copy file="test/org/apache/axis2/mail/mail-enabled-client-axis2.xml"
tofile="target/test-resources/mail-transport-client-enabledRepository/conf/axis2.xml"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/mail-transport-client-enabledRepository/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/test-resources/mail-transport-client-enabledRepository/modules/addressing-${addressing_version}.mar"/>
<!-- Create Mail Server transport enabled Repository -->
<mkdir dir="target/test-resources/mail-transport-server-enabledRepository"/>
@@ -105,14 +105,14 @@
<mkdir dir="target/test-resources/mail-transport-server-enabledRepository/modules"/>
<copy file="test/org/apache/axis2/mail/mail-enabled-server-axis2.xml"
tofile="target/test-resources/mail-transport-server-enabledRepository/conf/axis2.xml"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/mail-transport-server-enabledRepository/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/test-resources/mail-transport-server-enabledRepository/modules/addressing-${addressing_version}.mar"/>
<mkdir dir="target/test-resources/MessageContextInjectionRepo"/>
<mkdir dir="target/test-resources/integrationRepo/modules"/>
<mkdir dir="target/test-resources/integrationRepo/conf"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/integrationRepo/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/test-resources/integrationRepo/modules/addressing-${addressing_version}.mar"/>
<copy file="../core/conf/axis2.xml"
tofile="target/test-resources/integrationRepo/conf/axis2.xml"/>
@@ -142,8 +142,8 @@
<mkdir dir="target/groovyRepo/modules"/>
<ant:copy file="../samples/target/samples/groovyService.aar"
tofile="target/groovyRepo/services/groovyService.aar"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/groovyRepo/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/groovyRepo/modules/addressing-${addressing_version}.mar"/>
<copy file="../core/conf/axis2.xml"
tofile="target/groovyRepo/conf/axis2.xml"/>
@@ -155,8 +155,8 @@
<mkdir dir="target/test-resources/default_security_client_repo/modules"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/default_security_client_repo/modules/security.mar"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/default_security_client_repo/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/test-resources/default_security_client_repo/modules/addressing-${addressing_version}.mar"/>
<copy file="../core/conf/axis2.xml"
tofile="target/test-resources/default_security_client_repo/conf/axis2.xml"/>
@@ -507,16 +507,16 @@
tofile="target/test-resources/complete_client_repo/conf/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/complete_client_repo/modules/security.mar"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/complete_client_repo/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/test-resources/complete_client_repo/modules/addressing-${addressing_version}.mar"/>
<!-- Test with addressing and MTOMservice repository-->
<copy file="test-resources/security/complete.service.axis2.xml"
tofile="target/test-resources/complete_service_repo/conf/axis2.xml"/>
<copy file="../security/target/security.mar"
tofile="target/test-resources/complete_service_repo/modules/security.mar"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-resources/complete_service_repo/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/test-resources/complete_service_repo/modules/addressing-${addressing_version}.mar"/>
<!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/complete.service.xml"
@@ -533,8 +533,8 @@
<mkdir dir="target/Repository/conf"/>
<mkdir dir="target/Repository/services"/>
<mkdir dir="target/Repository/modules"/>
- <copy file="../addressing/target/addressing.mar"
- tofile="target/Repository/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/Repository/modules/addressing-${addressing_version}.mar"/>
<copy file="../core/conf/axis2.xml"
tofile="target/Repository/conf/axis2.xml"/>
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=372208&r1=372207&r2=372208&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java Wed Jan 25 05:31:09 2006
@@ -123,7 +123,7 @@
AxisService service) throws AxisFault {
DeploymentEngine deploymentEngine = new DeploymentEngine();
File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing.mar");
+ + "/modules/addressing-SNAPSHOT-0.95.mar");
TestCase.assertTrue(file.exists());
ConfigurationContext configContext = ConfigurationContextFactory
.createConfigurationContextFromFileSystem(
@@ -140,7 +140,7 @@
public static ConfigurationContext createClientConfigurationContext() throws AxisFault {
File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing.mar");
+ + "/modules/addressing-SNAPSHOT-0.95.mar");
TestCase.assertTrue(file.exists());
DeploymentEngine deploymentEngine = new DeploymentEngine();
@@ -157,7 +157,7 @@
AxisService service, String clientHome) throws AxisFault {
DeploymentEngine deploymentEngine = new DeploymentEngine();
File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing.mar");
+ + "/modules/addressing-SNAPSHOT-0.95.mar");
TestCase.assertTrue(file.exists());
ConfigurationContext configContext = ConfigurationContextFactory
Modified: webservices/axis2/trunk/java/modules/saaj/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/maven.xml?rev=372208&r1=372207&r2=372208&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/maven.xml Wed Jan 25 05:31:09 2006
@@ -20,8 +20,8 @@
<ant:property name="maven.class.path" refid="maven.dependency.classpath"/>
<!-- copy the mars so that they are available on the test classpath -->
- <copy file="../addressing/target/addressing.mar"
- tofile="target/test-classes/modules/addressing.mar"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/test-classes/modules/addressing-${addressing_version}.mar"/>
</preGoal>
<postGoal name="test:compile">
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java?rev=372208&r1=372207&r2=372208&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java Wed Jan 25 05:31:09 2006
@@ -114,7 +114,7 @@
AxisService service) throws AxisFault {
DeploymentEngine deploymentEngine = new DeploymentEngine();
File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing.mar");
+ + "/modules/addressing-SNAPSHOT-0.95.mar");
TestCase.assertTrue(file.exists());
ConfigurationContext configContext = ConfigurationContextFactory
@@ -131,7 +131,7 @@
public static ConfigurationContext createClientConfigurationContext() throws AxisFault {
File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing.mar");
+ + "/modules/addressing-SNAPSHOT-0.95.mar");
TestCase.assertTrue(file.exists());
DeploymentEngine deploymentEngine = new DeploymentEngine();
@@ -147,7 +147,7 @@
AxisService service, String clientHome) throws AxisFault {
DeploymentEngine deploymentEngine = new DeploymentEngine();
File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY
- + "/modules/addressing.mar");
+ + "/modules/addressing-SNAPSHOT-0.95.mar");
TestCase.assertTrue(file.exists());
ConfigurationContext configContext = ConfigurationContextFactory
Modified: webservices/axis2/trunk/java/modules/samples/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/maven.xml?rev=372208&r1=372207&r2=372208&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/maven.xml Wed Jan 25 05:31:09 2006
@@ -290,7 +290,7 @@
<mkdir dir="target/security/client_repo"/>
<mkdir dir="target/security/client_repo/modules"/>
- <ant:copy file="../addressing/target/modules/addressing.mar" tofile="target/toWar/modules/addressing.mar"/>
+ <ant:copy file="../addressing/target/modules/addressing-${addressing_version}.mar" tofile="target/toWar/modules/addressing-${addressing_version}.mar"/>
<!-- Copy the sources and others orver to the target/samples/security-->
<mkdir dir="target/samples/security/src/sample/security/"/>
@@ -298,7 +298,7 @@
<ant:fileset dir="src/sample/security" />
</ant:copy>
<mkdir dir="target/security/client_repo/modules"/>
- <ant:copy file="../addressing/target/modules/addressing.mar" tofile="target/samples/security/client_repo/modules/addressing.mar"/>
+ <ant:copy file="../addressing/target/modules/addressing-${addressing_version}.mar" tofile="target/samples/security/client_repo/modules/addressing-${addressing_version}.mar"/>
<ant:copy file="resources/security/client.axis2.xml" tofile="target/samples/security/client_repo/axis2.xml"/>
<ant:copy file="target/security/SecureService.aar" tofile="target/samples/security/SecureService.aar"/>
<ant:copy file="target/security/secUtil.jar" tofile="target/samples/security/secUtil.jar"/>
Modified: webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml?rev=372208&r1=372207&r2=372208&view=diff
==============================================================================
--- webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml (original)
+++ webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml Wed Jan 25 05:31:09 2006
@@ -336,7 +336,7 @@
<fileset dir="modules/doom/target/classes"/>
<fileset dir="modules/addressing/target/classes"/>
<fileset dir="modules/addressing/target/">
- <include name="modules/addressing.mar"/>
+ <include name="modules/addressing-${addressing_version}.mar"/>
</fileset>
</jar>
</goal>
@@ -372,7 +372,7 @@
<!-- copy the addressing mar -->
<ant:copy toDir="target/temp/war/toWEB-INF/modules">
- <ant:fileset file="modules/addressing/target/addressing.mar"/>
+ <ant:fileset file="modules/addressing/target/addressing-${addressing_version}.mar"/>
</ant:copy>
<!-- copy the sample services -->
@@ -526,7 +526,7 @@
<!-- Copy addressing mar -->
<ant:copy toDir="${std.bin.temp.dir}/modules">
- <ant:fileset file="modules/addressing/target/addressing.mar"/>
+ <ant:fileset file="modules/addressing/target/addressing-${addressing_version}.mar"/>
</ant:copy>
<!-- Copy the samples -->