You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ch...@apache.org on 2007/04/25 07:16:49 UTC
svn commit: r532202 - in /webservices/sandesha/trunk/java: maven.xml
modules/tests/src/org/apache/sandesha2/SandeshaTestCase.java project.xml
Author: chamikara
Date: Tue Apr 24 22:16:48 2007
New Revision: 532202
URL: http://svn.apache.org/viewvc?view=rev&rev=532202
Log:
patch from sumedha - Sandesha2 86
Modified:
webservices/sandesha/trunk/java/maven.xml
webservices/sandesha/trunk/java/modules/tests/src/org/apache/sandesha2/SandeshaTestCase.java
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=532202&r1=532201&r2=532202
==============================================================================
--- webservices/sandesha/trunk/java/maven.xml (original)
+++ webservices/sandesha/trunk/java/maven.xml Tue Apr 24 22:16:48 2007
@@ -21,7 +21,7 @@
<ant:property name="client.jar.name" value="${pom.artifactId}-client-${sandesha2.version}.jar"/>
<ant:property name="dir.samples" value="modules/samples"/>
- <ant:property name="dir.test.resources" value="modules/test/test-resources"/>
+ <ant:property name="dir.test.resources" value="modules/tests/resources"/>
<ant:property name="dir.config" value="config"/>
<ant:property name="dir.interop" value="modules/interop"/>
@@ -80,7 +80,7 @@
<!-- For the client side -->
<copy todir="${build.temp.dir}/module">
- <fileset dir="${basedir}/modules/core/target/classes" >
+ <fileset dir="${basedir}/target/classes" >
<include name="**/*.class"/>
<include name="**/*.properties" />
</fileset>
@@ -99,10 +99,10 @@
<ant:mkdir dir="${jar.temp.path}" />
<copy todir="${jar.temp.path}">
- <fileset dir="${basedir}/modules/core/target/classes" >
+ <fileset dir="${basedir}/target/classes" >
<include name="**/*.class"/>
</fileset>
- <fileset dir="${basedir}/modules/core/target/classes" >
+ <fileset dir="${basedir}/target/classes" >
<include name="**/*.properties" />
</fileset>
</copy>
@@ -122,7 +122,7 @@
<ant:mkdir dir="${policy.jar.temp.path}" />
<copy todir="${policy.jar.temp.path}">
- <fileset dir="${basedir}/modules/core/target/classes" >
+ <fileset dir="${basedir}/target/classes" >
<include name="**/policy/**/*.class"/>
<include name="**/*Sandesha2Constants*.class"/>
<include name="**/*.properties" />
@@ -151,7 +151,7 @@
<!-- For the client side -->
<copy todir="${build.temp.dir}/client">
- <fileset dir="${basedir}/modules/core/target/classes" >
+ <fileset dir="${basedir}/target/classes" >
<include name="**/sandesha2/client/*SandeshaClientConstants*.*" />
<include name="**/sandesha2/client/*SandeshaListener*.*" />
<include name="**/sandesha2/client/*SequenceReport*.*" />
@@ -164,7 +164,6 @@
tofile="${maven.repo.local}/${pom.groupId}/jars/${client.jar.name}"/>
<delete dir="${build.temp.dir}" />
-
</goal>
<goal name="client:create" prereqs="mar">
@@ -302,10 +301,13 @@
</goal>
<goal name="repo:create">
- <attainGoal name="server:create"/>
+ <attainGoal name="server:create"/>
<attainGoal name="client:create"/>
+<!--
+
<attainGoal name="secure:create"/>
- <attainGoal name="serialize:create"/>
+ <attainGoal name="serialize:create"/>
+-->
</goal>
<goal name="server:create" prereqs="mar,sample:create">
@@ -326,13 +328,13 @@
<ant:copy file="${repo.rampart.mar}" toDir="${server.dist.path}/modules/" />
</goal>
- <goal name="sample:compile">
+ <goal name="sample:compile" prereqs="client:jar">
<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}/modules/core/target/classes" />
+ <ant:classpath path="${basedir}/target/classes" />
</ant:javac>
</goal>
@@ -421,10 +423,8 @@
</goal>
<preGoal name="test:test" >
- <!--
<attainGoal name="server:create"/>
- <attainGoal name="client:create"/>
- -->
+ <attainGoal name="client:create"/>
</preGoal>
<goal name="server.copy.tomcat" prereqs="server:create">
Modified: webservices/sandesha/trunk/java/modules/tests/src/org/apache/sandesha2/SandeshaTestCase.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/org/apache/sandesha2/SandeshaTestCase.java?view=diff&rev=532202&r1=532201&r2=532202
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/src/org/apache/sandesha2/SandeshaTestCase.java (original)
+++ webservices/sandesha/trunk/java/modules/tests/src/org/apache/sandesha2/SandeshaTestCase.java Tue Apr 24 22:16:48 2007
@@ -79,7 +79,7 @@
public SandeshaTestCase(String name) {
super(name);
File baseDir = new File("");
- String testRource = baseDir.getAbsolutePath() + File.separator + "test-resources";
+ String testRource = baseDir.getAbsolutePath() + File.separator + "target"+File.separator+"test-classes";
resourceDir = new File(testRource).getPath();
String propFileStr = resourceDir + File.separator + PROPERTY_FILE_NAME;
Modified: webservices/sandesha/trunk/java/project.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.xml?view=diff&rev=532202&r1=532201&r2=532202
==============================================================================
--- webservices/sandesha/trunk/java/project.xml (original)
+++ webservices/sandesha/trunk/java/project.xml Tue Apr 24 22:16:48 2007
@@ -83,30 +83,39 @@
<build>
<nagEmailAddress>sandesha-dev@ws.apache.org</nagEmailAddress>
<sourceDirectory>modules/core/src/main/java</sourceDirectory>
- <unitTestSourceDirectory>modules/tests/src</unitTestSourceDirectory>
+ <unitTestSourceDirectory>modules/tests/src</unitTestSourceDirectory>
+
<unitTest>
<includes>
<include>**/*Test.java</include>
</includes>
<excludes>
<exclude>**/CloseSequenceTest.java</exclude>
- </excludes>
- <resources>
+ </excludes>
+
+ <resources>
<resource>
- <directory>modules/tests/test-resources</directory>
+ <directory>${basedir}/modules/tests/test-resources</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>modules/core/src/main/resources</directory>
+ <directory>${basedir}/modules/core/src/main/resources</directory>
<includes>
<include>**/*.properties</include>
</includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/config</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
</resource>
- </resources>
+ </resources>
+
</unitTest>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org