Author: chamikara
Date: Tue Apr 24 01:55:43 2007
New Revision: 531836
URL: http://svn.apache.org/viewvc?view=rev&rev=531836
Log:
More corrections from Sumedha
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=531836&r1=531835&r2=531836
==============================================================================
--- webservices/sandesha/trunk/java/maven.xml (original)
+++ webservices/sandesha/trunk/java/maven.xml Tue Apr 24 01:55:43 2007
@@ -54,11 +54,17 @@
<!-- Copying the policy Assertion files-->
<copy todir="${build.classes.dir}">
- <fileset dir="${dir.config}/rmpolicy/">
+ <fileset dir="${dir.config}/rmpolicy/">
<include name="**/*" />
- </fileset>
- </copy>
-
+ </fileset>
+ </copy>
+<!--
+ <copy todir="modules/tests/test-resources">
+ <fileset dir="modules/core/src/main/resources/">
+ <include name="**/*.properties" />
+ </fileset>
+ </copy>
+-->
</preGoal>
<goal name="mar" prereqs="java:compile">
@@ -70,10 +76,11 @@
<ant:property name="metainf.path"
value="${build.temp.dir}/module/META-INF" />
<ant:mkdir dir="${metainf.path}" />
- <ant:copy file="${basedir}/modules/mar/module.xml"
todir="${metainf.path}" />
- <!-- For the client side -->
+ <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>
@@ -92,10 +99,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}/target/classes" >
+ <fileset dir="${basedir}/modules/core/target/classes" >
<include name="**/*.properties" />
</fileset>
</copy>
@@ -104,9 +111,9 @@
<copy file="${maven.build.dir}/${jar.name}"
toDir="${maven.repo.local}/${pom.groupId}/jars"/>
- <!--
+
<delete dir="${build.temp.dir}" />
--->
+
</goal>
<goal name="policy:jar" prereqs="java:compile">
@@ -115,7 +122,7 @@
<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" />
@@ -144,7 +151,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*.*" />
@@ -319,13 +326,13 @@
<ant:copy file="${repo.rampart.mar}"
toDir="${server.dist.path}/modules/" />
</goal>
- <goal name="sample:compile" prereqs="client:jar">
+ <goal name="sample:compile">
<ant:mkdir dir="${basedir}/target/samples/classes" />
<ant:mkdir dir="${basedir}/target/samples/services" />
<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>
@@ -380,7 +387,7 @@
<ant:mkdir dir="${basedir}/target/interop/classes" />
<ant:mkdir dir="${basedir}/target/interop/services" />
- <ant:javac srcdir="${dir.interop}/src/main/java"
destdir="${basedir}/target/interop/classes" debug="on">
+ <ant:javac srcdir="${dir.interop}/src"
destdir="${basedir}/target/interop/classes" debug="on">
<ant:classpath refid="maven.dependency.classpath" />
<ant:classpath path="${basedir}/target/classes" />
</ant:javac>
Modified: webservices/sandesha/trunk/java/project.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.xml?view=diff&rev=531836&r1=531835&r2=531836
==============================================================================
--- webservices/sandesha/trunk/java/project.xml (original)
+++ webservices/sandesha/trunk/java/project.xml Tue Apr 24 01:55:43 2007
@@ -93,11 +93,19 @@
</excludes>
<resources>
<resource>
- <directory>test-resources</directory>
+ <directory>modules/tests/test-resources</directory>
<includes>
- <include>**/*.xml</include>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>modules/core/src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
</includes>
</resource>
+
</resources>
</unitTest>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
