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 2005/11/25 05:24:27 UTC
svn commit: r348869 - in /webservices/sandesha/trunk: maven.xml project.xml
Author: chamikara
Date: Thu Nov 24 20:24:09 2005
New Revision: 348869
URL: http://svn.apache.org/viewcvs?rev=348869&view=rev
Log:
Updated maven files.
Modified:
webservices/sandesha/trunk/maven.xml
webservices/sandesha/trunk/project.xml
Modified: webservices/sandesha/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/maven.xml?rev=348869&r1=348868&r2=348869&view=diff
==============================================================================
--- webservices/sandesha/trunk/maven.xml (original)
+++ webservices/sandesha/trunk/maven.xml Thu Nov 24 20:24:09 2005
@@ -3,11 +3,15 @@
<project default="all" xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:deploy="deploy" xmlns:ant="jelly:ant">
<j:set var="dist.name" value="${pom.artifactId}-${pom.currentVersion}"/>
<j:set var="dist.dir" value="target/dist"/>
-
- <goal name="all" prereqs="jar,module.jar,interop.jar,client:create,server:create" />
+ <ant:property name="module.jar.name" value="sandesha.mar"/>
+ <ant:property name="oneway.service.jar.name" value="RMOneWayService.jar" />
+ <ant:property name="rr.service.jar.name" value="RMRequestReplyService.jar" />
+ <ant:property name="interop.service.jar.name" value="RMInteropService.jar" />
+
+ <goal name="all" prereqs="jar,module.jar,onewayservice.jar,requestreplyservice.jar,interopservice.jar,client:create,server:create" />
<goal name="module.jar" prereqs="java:compile">
- <ant:property name="module.jar.name" value="sandesha.mar"/>
+ <!-- <ant:property name="module.jar.name" value="sandesha.mar"/> -->
<ant:property name="metainf.path" value="${maven.build.dir}/dist/module/META-INF" />
<ant:mkdir dir="${maven.build.dir}/dist" />
<ant:mkdir dir="${maven.build.dir}/dist/module" />
@@ -26,7 +30,7 @@
</goal>
<goal name="client:create" prereqs="module.jar">
- <ant:property name="module.jar.name" value="sandesha.mar"/>
+ <!-- <ant:property name="module.jar.name" value="sandesha.mar"/> -->
<ant:property name="client.dist.path" value="${maven.build.dir}/client"/>
<ant:mkdir dir="${client.dist.path}" />
<ant:mkdir dir="${client.dist.path}/modules" />
@@ -35,15 +39,17 @@
</goal>
<goal name="server:create" prereqs="module.jar">
- <ant:property name="module.jar.name" value="sandesha.mar"/>
- <ant:property name="service.jar.name" value="InteropService.jar"/>
+ <!-- <ant:property name="module.jar.name" value="sandesha.mar"/> -->
+ <!-- <ant:property name="service.jar.name" value="InteropService.jar"/> -->
<ant:property name="server.dist.path" value="${maven.build.dir}/server"/>
<ant:mkdir dir="${server.dist.path}" />
<ant:mkdir dir="${server.dist.path}/modules" />
<ant:mkdir dir="${server.dist.path}/services" />
<ant:copy file="${basedir}/config/axis2.xml" todir="${server.dist.path}" />
<ant:copy file="${maven.build.dir}/dist/${module.jar.name}" todir="${server.dist.path}/modules" />
- <ant:copy file="${maven.build.dir}/dist/${service.jar.name}" todir="${server.dist.path}/services" />
+ <!-- <ant:copy file="${maven.build.dir}/dist/${oneway.service.jar.name}" todir="${server.dist.path}/services" />
+ <ant:copy file="${maven.build.dir}/dist/${rr.service.jar.name}" todir="${server.dist.path}/services" /> -->
+ <ant:copy file="${maven.build.dir}/dist/${interop.service.jar.name}" todir="${server.dist.path}/services" />
</goal>
<goal name="sample:compile">
@@ -55,21 +61,66 @@
</ant:javac>
</goal>
- <goal name="interop.jar" prereqs="sample:compile">
+ <goal name="interopservice.jar" prereqs="sample:compile">
<ant:property name="dir.samples" value="samples"/>
- <ant:property name="service.jar.name" value="InteropService.jar"/>
- <ant:mkdir dir="${basedir}/target/dist" />
- <ant:mkdir dir="${basedir}/target/samples/classes/META-INF" />
- <ant:copy file="${dir.samples}/conf/interop/services.xml" todir="${basedir}/target/samples/classes/META-INF" />
- <ant:jar jarfile="${basedir}/target/dist/${service.jar.name}" basedir="${maven.build.dir}/samples/classes" />
+ <ant:property name="dir.interop" value="${basedir}/target/samples/interopservice"/>
+ <!-- <ant:property name="service.jar.name" value="RMInteropService.jar"/> -->
+ <ant:mkdir dir="${dir.interop}" />
+ <ant:mkdir dir="${dir.interop}/META-INF" />
+
+ <ant:copy file="${dir.samples}/conf/interop/services.xml" todir="${dir.interop}/META-INF" />
+ <ant:copy todir="${dir.interop}" >
+ <ant:fileset dir="${maven.build.dir}/samples/classes">
+ <ant:include name="**/*.class"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:jar jarfile="${basedir}/target/dist/${interop.service.jar.name}" basedir="${dir.interop}" />
+ </goal>
+
+ <goal name="onewayservice.jar" prereqs="sample:compile">
+ <ant:property name="dir.samples" value="samples"/>
+ <ant:property name="dir.oneway" value="${basedir}/target/samples/onewayservice"/>
+ <!-- <ant:property name="service.jar.name" value="InteropService.jar"/> -->
+ <ant:mkdir dir="${dir.oneway}" />
+ <ant:mkdir dir="${dir.oneway}/META-INF" />
+
+ <ant:copy file="${dir.samples}/conf/interop/onewayservice/services.xml" todir="${dir.oneway}/META-INF" />
+ <ant:copy todir="${dir.oneway}" >
+ <ant:fileset dir="${maven.build.dir}/samples/classes">
+ <ant:include name="**/*.class"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:jar jarfile="${basedir}/target/dist/${oneway.service.jar.name}" basedir="${dir.oneway}" />
</goal>
- <goal name="jar.copy" prereqs="module.jar,interop.jar">
+ <goal name="requestreplyservice.jar" prereqs="sample:compile">
+ <ant:property name="dir.samples" value="samples"/>
+ <ant:property name="dir.requestreply" value="${basedir}/target/samples/requestreplyservice"/>
+ <!-- <ant:property name="service.jar.name" value="InteropService.jar"/> -->
+ <ant:mkdir dir="${dir.requestreply}" />
+ <ant:mkdir dir="${dir.requestreply}/META-INF" />
+
+ <ant:copy file="${dir.samples}/conf/interop/requestreplyservice/services.xml" todir="${dir.requestreply}/META-INF" />
+ <ant:copy todir="${dir.requestreply}" >
+ <ant:fileset dir="${maven.build.dir}/samples/classes">
+ <ant:include name="**/*.class"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:jar jarfile="${basedir}/target/dist/${rr.service.jar.name}" basedir="${dir.requestreply}" />
+ </goal>
+
+ <goal name="jar.copy" prereqs="module.jar,onewayservice.jar,requestreplyservice.jar">
<property environment="env1"/>
<property name="webapps" value="${env1.CATALINA_HOME}/webapps"/>
- <ant:copy file="${basedir}/target/dist/sandesha.mar" todir="${webapps}/axis2/WEB-INF/modules"/>
- <!-- <ant:copy file="${basedir}/target/dist/sandesha.mar" todir="${basedir}/target/classes/modules"/> --> <!-- For the client side -->
- <ant:copy file="${basedir}/target/dist/InteropService.jar" todir="${webapps}/axis2/WEB-INF/services"/>
+ <ant:copy file="${basedir}/target/dist/${module.jar.name}" todir="${webapps}/axis2/WEB-INF/modules"/>
+ <!-- <ant:copy file="${basedir}/target/dist/${module.jar.name}" todir="${basedir}/target/classes/modules"/> --> <!-- For the client side -->
+ <!-- <ant:copy file="${basedir}/target/dist/${oneway.service.jar.name}" todir="${webapps}/axis2/WEB-INF/services"/>
+ <ant:copy file="${basedir}/target/dist/${rr.service.jar.name}" todir="${webapps}/axis2/WEB-INF/services"/> -->
+ <ant:copy file="${basedir}/target/dist/${interop.service.jar.name}" todir="${webapps}/axis2/WEB-INF/services"/>
+
</goal>
<!-- <preGoal name="java:compile">-->
Modified: webservices/sandesha/trunk/project.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/project.xml?rev=348869&r1=348868&r2=348869&view=diff
==============================================================================
--- webservices/sandesha/trunk/project.xml (original)
+++ webservices/sandesha/trunk/project.xml Thu Nov 24 20:24:09 2005
@@ -189,7 +189,7 @@
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2</artifactId>
- <version>0.92</version>
+ <version>0.93-dev</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org