Author: chamikara
Date: Mon Apr 23 02:36:06 2007
New Revision: 531398
URL: http://svn.apache.org/viewvc?view=rev&rev=531398
Log:
Applied the patch from Sumedha on the maven2 build - Sandesha2 86
Removed:
webservices/sandesha/trunk/java/interop/
webservices/sandesha/trunk/java/src/
webservices/sandesha/trunk/java/test/
webservices/sandesha/trunk/java/test-resources/
Modified:
webservices/sandesha/trunk/java/maven.xml
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=531398&r1=531397&r2=531398
==============================================================================
--- webservices/sandesha/trunk/java/maven.xml (original)
+++ webservices/sandesha/trunk/java/maven.xml Mon Apr 23 02:36:06 2007
@@ -20,10 +20,10 @@
<ant:property name="jar.name" value="${dist.name}.jar"/>
<ant:property name="client.jar.name"
value="${pom.artifactId}-client-${sandesha2.version}.jar"/>
- <ant:property name="dir.samples" value="samples"/>
- <ant:property name="dir.test.resources" value="test-resources"/>
+ <ant:property name="dir.samples" value="modules/samples"/>
+ <ant:property name="dir.test.resources"
value="modules/test/test-resources"/>
<ant:property name="dir.config" value="config"/>
- <ant:property name="dir.interop" value="interop"/>
+ <ant:property name="dir.interop" value="modules/interop"/>
<ant:property name="apache.license.file" value="LICENSE.txt" />
<ant:property name="readme.file" value="README.txt" />
@@ -63,18 +63,18 @@
<goal name="mar" prereqs="java:compile">
<copy todir="${maven.build.dir}/classes/">
- <fileset dir="${basedir}/src">
+ <fileset dir="${basedir}/modules/mar">
<include name="**/*.properties" />
</fileset>
</copy>
<ant:property name="metainf.path"
value="${build.temp.dir}/module/META-INF" />
<ant:mkdir dir="${metainf.path}" />
- <ant:copy file="${basedir}/config/module.xml" todir="${metainf.path}" />
+ <ant:copy file="${basedir}/modules/mar/module.xml"
todir="${metainf.path}" />
<!-- For the client side -->
<copy todir="${build.temp.dir}/module">
- <fileset dir="${basedir}/target/classes" >
+ <fileset dir="${basedir}/modules/core/target/classes" >
<include name="**/*.class"/>
<include name="**/*.properties" />
</fileset>
@@ -93,8 +93,10 @@
<ant:mkdir dir="${jar.temp.path}" />
<copy todir="${jar.temp.path}">
- <fileset dir="${basedir}/target/classes" >
+ <fileset dir="${basedir}/modules/core/target/classes" >
<include name="**/*.class"/>
+ </fileset>
+ <fileset dir="${basedir}/modules/core/target/classes" >
<include name="**/*.properties" />
</fileset>
</copy>
@@ -103,8 +105,9 @@
<copy file="${maven.build.dir}/${jar.name}"
toDir="${maven.repo.local}/${pom.groupId}/jars"/>
-
- <delete dir="${build.temp.dir}" />
+ <!--
+ <delete dir="${build.temp.dir}" />
+-->
</goal>
<goal name="policy:jar" prereqs="java:compile">
@@ -113,13 +116,13 @@
<ant:mkdir dir="${policy.jar.temp.path}" />
<copy todir="${policy.jar.temp.path}">
- <fileset dir="${basedir}/target/classes" >
+ <fileset dir="${basedir}/modules/core/target/classes" >
<include name="**/policy/**/*.class"/>
<include name="**/*Sandesha2Constants*.class"/>
- <include name="**/*.properties" />
+ <include name="**/*.properties" />
<include name="**/*SandeshaException*.class"/>
<include name="**/i18n/**" />
- </fileset>
+ </fileset>
</copy>
<copy todir="${policy.jar.temp.path}" >
@@ -142,7 +145,7 @@
<!-- For the client side -->
<copy todir="${build.temp.dir}/client">
- <fileset dir="${basedir}/target/classes" >
+ <fileset dir="${basedir}/modules/core/target/classes" >
<include name="**/sandesha2/client/*SandeshaClientConstants*.*"
/>
<include name="**/sandesha2/client/*SandeshaListener*.*" />
<include name="**/sandesha2/client/*SequenceReport*.*" />
@@ -323,7 +326,7 @@
<ant:javac srcdir="${dir.samples}/src"
destdir="${basedir}/target/samples/classes" debug="on">
<ant:classpath refid="maven.dependency.classpath" />
- <ant:classpath path="${basedir}/target/classes" />
+ <ant:classpath path="${basedir}/modules/core/target/classes" />
</ant:javac>
</goal>
@@ -391,8 +394,8 @@
<ant:mkdir dir="${dir.interop.service.temp}" />
<ant:mkdir dir="${dir.interop.service.temp}/META-INF" />
- <ant:copy file="${dir.interop}/conf/services.xml"
todir="${dir.interop.service.temp}/META-INF" />
- <ant:copy file="${dir.interop}/conf/RMInteropService.wsdl"
todir="${dir.interop.service.temp}/META-INF" />
+ <ant:copy file="${dir.interop}/src/resources/conf/services.xml"
todir="${dir.interop.service.temp}/META-INF" />
+ <ant:copy
file="${dir.interop}/src/resources/conf/RMInteropService.wsdl"
todir="${dir.interop.service.temp}/META-INF" />
<ant:copy todir="${dir.interop.service.temp}" >
<ant:fileset dir="${maven.build.dir}/interop/classes">
<ant:exclude name="**/*clients*/**" />
@@ -402,9 +405,9 @@
<ant:jar jarfile="${build.interop.dir}/${interop.service.aar.name}"
basedir="${dir.interop.service.temp}" overwrite="true"/>
<ant:copy file="${build.interop.dir}/${interop.service.aar.name}"
toDir="${build.repo.dir}/server/services" overwrite="true"/>
- <ant:copy file="${dir.interop}/conf/sec-services.xml"
toFile="${dir.interop.service.temp}/META-INF/services.xml" overwrite="true"/>
- <ant:copy file="${dir.interop}/conf/SecRMInteropService.wsdl"
toFile="${dir.interop.service.temp}/META-INF/RMInteropService.wsdl"
overwrite="true"/>
- <ant:copy file="${dir.interop}/conf/store.jks"
toFile="${dir.interop.service.temp}/store.jks" overwrite="true"/>
+ <ant:copy file="${dir.interop}/src/resources/conf/sec-services.xml"
toFile="${dir.interop.service.temp}/META-INF/services.xml" overwrite="true"/>
+ <ant:copy
file="${dir.interop}/src/resources/conf/SecRMInteropService.wsdl"
toFile="${dir.interop.service.temp}/META-INF/RMInteropService.wsdl"
overwrite="true"/>
+ <ant:copy file="${dir.interop}/src/resources/conf/store.jks"
toFile="${dir.interop.service.temp}/store.jks" overwrite="true"/>
<ant:jar
jarfile="${build.interop.dir}/${interop.sec.service.aar.name}"
basedir="${dir.interop.service.temp}" overwrite="true"/>
<ant:copy file="${build.interop.dir}/${interop.sec.service.aar.name}"
toDir="${build.repo.dir}/server/services" overwrite="true"/>
Modified: webservices/sandesha/trunk/java/project.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.xml?view=diff&rev=531398&r1=531397&r2=531398
==============================================================================
--- webservices/sandesha/trunk/java/project.xml (original)
+++ webservices/sandesha/trunk/java/project.xml Mon Apr 23 02:36:06 2007
@@ -82,14 +82,14 @@
<build>
<nagEmailAddress>[email protected]</nagEmailAddress>
- <sourceDirectory>src</sourceDirectory>
- <unitTestSourceDirectory>test/src</unitTestSourceDirectory>
+ <sourceDirectory>modules/core/src/main/java</sourceDirectory>
+ <unitTestSourceDirectory>modules/tests/src</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
</includes>
<excludes>
- <exclude>**/CloseSequenceTest.java</exclude>
+ <exclude>**/CloseSequenceTest.java</exclude>
</excludes>
<resources>
<resource>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
