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/05/06 14:29:12 UTC
svn commit: r535604 - in /webservices/sandesha/trunk/java: ./ config/
config/rmpolicy/ modules/samples/ modules/tests/
modules/tests/test-resources/
Author: chamikara
Date: Sun May 6 05:29:11 2007
New Revision: 535604
URL: http://svn.apache.org/viewvc?view=rev&rev=535604
Log:
Corrected dependencies.
Moved some resources files to correct places.
Some other corrections.
Added:
webservices/sandesha/trunk/java/modules/tests/test-resources/client_axis2.xml
- copied unchanged from r535599, webservices/sandesha/trunk/java/config/client_axis2.xml
webservices/sandesha/trunk/java/modules/tests/test-resources/server_axis2.xml
- copied unchanged from r535599, webservices/sandesha/trunk/java/config/server_axis2.xml
Removed:
webservices/sandesha/trunk/java/config/client_axis2.xml
webservices/sandesha/trunk/java/config/module.xml
webservices/sandesha/trunk/java/config/rmpolicy/
webservices/sandesha/trunk/java/config/server_axis2.xml
Modified:
webservices/sandesha/trunk/java/maven.xml
webservices/sandesha/trunk/java/modules/samples/pom.xml
webservices/sandesha/trunk/java/modules/tests/pom.xml
webservices/sandesha/trunk/java/modules/tests/tests.build.xml
webservices/sandesha/trunk/java/pom.xml
webservices/sandesha/trunk/java/project.properties
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=535604&r1=535603&r2=535604
==============================================================================
--- webservices/sandesha/trunk/java/maven.xml (original)
+++ webservices/sandesha/trunk/java/maven.xml Sun May 6 05:29:11 2007
@@ -158,7 +158,7 @@
<ant:property name="client.dist.path" value="${build.repo.dir}/client"/>
<ant:mkdir dir="${client.dist.path}" />
<ant:mkdir dir="${client.dist.path}/modules" />
- <ant:copy file="${dir.config}/client_axis2.xml" todir="${client.dist.path}" />
+ <ant:copy file="modules/tests/test-resources/client_axis2.xml" todir="${client.dist.path}" />
<ant:copy file="${maven.build.dir}/${mar.name}" todir="${client.dist.path}/modules" />
<!-- Copying addressing mar file-->
@@ -296,7 +296,7 @@
<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/server_axis2.xml" todir="${server.dist.path}" />
+ <ant:copy file="modules/tests/test-resources/server_axis2.xml" todir="${server.dist.path}" />
<ant:copy file="${maven.build.dir}/${mar.name}" todir="${server.dist.path}/modules" />
<ant:copy todir="${server.dist.path}/services" >
<ant:fileset dir="${build.samples.services.dir}">
@@ -356,7 +356,7 @@
<ant:jar jarfile="${build.samples.clients.dir}/${userguide.client.jar.name}" basedir="${dir.sample.userguideclients.temp}" />
<ant:copy todir="${build.samples.clients.dir}" >
- <ant:fileset dir="${dir.samples}/conf/userguide">
+ <ant:fileset dir="${dir.samples}/src/main/resources/userguide">
<ant:include name="*.bat" />
<ant:include name="*.sh" />
<ant:include name="*.html" />
@@ -455,7 +455,7 @@
<ant:mkdir dir="${dir.temp.dist.bin}/samples/services"/>
<ant:mkdir dir="${dir.temp.dist.bin}/docs/api"/>
- <ant:copy file="${dir.config}/client_axis2.xml" todir="${dir.temp.dist.bin}/samples/clients" />
+ <ant:copy file="modules/tests/test-resources/client_axis2.xml" todir="${dir.temp.dist.bin}/samples/clients" />
<ant:copy todir="${dir.temp.dist.bin}/docs/api">
<ant:fileset dir="target/docs/apidocs/">
Modified: webservices/sandesha/trunk/java/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/samples/pom.xml?view=diff&rev=535604&r1=535603&r2=535604
==============================================================================
--- webservices/sandesha/trunk/java/modules/samples/pom.xml (original)
+++ webservices/sandesha/trunk/java/modules/samples/pom.xml Sun May 6 05:29:11 2007
@@ -74,11 +74,13 @@
<artifactId>sandesha2-policy</artifactId>
<version>${pom.version}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2</artifactId>
<version>${pom.version}</version>
</dependency>
+ -->
</dependencies>
</project>
Modified: webservices/sandesha/trunk/java/modules/tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/pom.xml?view=diff&rev=535604&r1=535603&r2=535604
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/pom.xml (original)
+++ webservices/sandesha/trunk/java/modules/tests/pom.xml Sun May 6 05:29:11 2007
@@ -61,7 +61,14 @@
</execution>
</executions>
</plugin>
-
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -85,11 +92,13 @@
<artifactId>sandesha2-samples</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2</artifactId>
<version>${pom.version}</version>
</dependency>
+-->
+
</dependencies>
</project>
Modified: webservices/sandesha/trunk/java/modules/tests/tests.build.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/tests.build.xml?view=diff&rev=535604&r1=535603&r2=535604
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/tests.build.xml (original)
+++ webservices/sandesha/trunk/java/modules/tests/tests.build.xml Sun May 6 05:29:11 2007
@@ -17,7 +17,7 @@
<mkdir dir="${server.dist.path}/modules" />
<mkdir dir="${server.dist.path}/services" />
- <copy file="${basedir}/../../config/server_axis2.xml" todir="${server.dist.path}" />
+ <copy file="${basedir}/test-resources/server_axis2.xml" todir="${server.dist.path}" />
<copy file="${basedir}/../mar/target/sandesha2-${sandesha2.version}.mar" todir="${server.dist.path}/modules" />
<copy todir="${server.dist.path}/services" >
@@ -43,7 +43,7 @@
<mkdir dir="${client.dist.path}" />
<mkdir dir="${client.dist.path}/modules" />
- <copy file="${basedir}/../../config/client_axis2.xml" todir="${client.dist.path}" />
+ <copy file="${basedir}/test-resources/client_axis2.xml" todir="${client.dist.path}" />
<copy file="${basedir}/../mar/target/sandesha2-${sandesha2.version}.mar" todir="${client.dist.path}/modules" />
<!-- Copying dependent mar files -->
Modified: webservices/sandesha/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/pom.xml?view=diff&rev=535604&r1=535603&r2=535604
==============================================================================
--- webservices/sandesha/trunk/java/pom.xml (original)
+++ webservices/sandesha/trunk/java/pom.xml Sun May 6 05:29:11 2007
@@ -463,7 +463,7 @@
<junit.version>3.8.1</junit.version>
<xmlunit.version>1.0</xmlunit.version>
<log4j.version>1.2.13</log4j.version>
- <jakarta.httpcore.version>4.0-alpha3</jakarta.httpcore.version>
+ <jakarta.httpcore.version>4.0-alpha4</jakarta.httpcore.version>
<commons.collections.version>3.1</commons.collections.version>
<commons.fileupload.version>1.1.1</commons.fileupload.version>
<commons.discovery.version>0.2</commons.discovery.version>
Modified: webservices/sandesha/trunk/java/project.properties
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.properties?view=diff&rev=535604&r1=535603&r2=535604
==============================================================================
--- webservices/sandesha/trunk/java/project.properties (original)
+++ webservices/sandesha/trunk/java/project.properties Sun May 6 05:29:11 2007
@@ -51,8 +51,8 @@
stax.impl.version=asl-3.0.0
wsdl4j.version=1.6.2
jakarta.httpcore.version=4.0-alpha4
-geronimo.spec.activation.version=1.0.2-rc4
-geronimo.spec.javamail.version=1.3.1-rc5
+activation.version=1.1
+javamail.version=1.4
xmlsec.version=1.4-SNAPSHOT
bcprov.version=jdk13-133
Modified: webservices/sandesha/trunk/java/project.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.xml?view=diff&rev=535604&r1=535603&r2=535604
==============================================================================
--- webservices/sandesha/trunk/java/project.xml (original)
+++ webservices/sandesha/trunk/java/project.xml Sun May 6 05:29:11 2007
@@ -216,15 +216,15 @@
<artifactId>backport-util-concurrent</artifactId>
<version>${backport_util_concurrent.version}</version>
</dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>${geronimo.spec.activation.version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- <version>${geronimo.spec.javamail.version}</version>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${activation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javamail.version}</version>
</dependency>
<dependency>
<groupId>${axis2.jar.groupid}</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org