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 2007/05/02 19:36:17 UTC

svn commit: r534564 - in /webservices/sandesha/trunk/java: ./ modules/core/src/main/java/org/apache/sandesha2/ modules/samples/ modules/samples/conf/ modules/samples/src/main/ modules/samples/src/main/java/ modules/samples/src/main/java/sandesha2/ modu...

Author: chamikara
Date: Wed May  2 10:36:15 2007
New Revision: 534564

URL: http://svn.apache.org/viewvc?view=rev&rev=534564
Log:
Added the samples and test modules to the maven2 build. 
Repo creation and sample creation scripts were written in seperate Ant files which get called from the pom.xml file.
Moved the test and sample; src,resources files to the correct locations.
Maven1 build was corrected according to these changes.


Added:
    webservices/sandesha/trunk/java/modules/samples/pom.xml
    webservices/sandesha/trunk/java/modules/samples/samples.build.xml
    webservices/sandesha/trunk/java/modules/samples/src/main/
    webservices/sandesha/trunk/java/modules/samples/src/main/java/
    webservices/sandesha/trunk/java/modules/samples/src/main/java/sandesha2/
      - copied from r533340, webservices/sandesha/trunk/java/modules/samples/src/sandesha2/
    webservices/sandesha/trunk/java/modules/samples/src/main/java/sandesha2/samples/
      - copied from r534554, webservices/sandesha/trunk/java/modules/samples/src/sandesha2/samples/
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/
      - copied from r533340, webservices/sandesha/trunk/java/modules/samples/conf/userguide/
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/AsyncEchoClient.bat
      - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/AsyncEchoClient.bat
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/AsyncEchoClient.sh
      - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/AsyncEchoClient.sh
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/AsyncPingClient.bat
      - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/AsyncPingClient.bat
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/AsyncPingClient.sh
      - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/AsyncPingClient.sh
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/SyncEchoClient.bat
      - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/SyncEchoClient.bat
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/SyncEchoClient.sh
      - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/SyncEchoClient.sh
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/SyncPingClient.bat
      - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/SyncPingClient.bat
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/SyncPingClient.sh
      - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/SyncPingClient.sh
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/services.xml
      - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/services.xml
    webservices/sandesha/trunk/java/modules/samples/src/main/resources/userguide/userguide_sample.html
      - copied unchanged from r534554, webservices/sandesha/trunk/java/modules/samples/conf/userguide/userguide_sample.html
    webservices/sandesha/trunk/java/modules/tests/pom.xml
    webservices/sandesha/trunk/java/modules/tests/src/test/
    webservices/sandesha/trunk/java/modules/tests/src/test/java/
    webservices/sandesha/trunk/java/modules/tests/src/test/java/org/
      - copied from r533340, webservices/sandesha/trunk/java/modules/tests/src/org/
    webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/
      - copied from r534554, webservices/sandesha/trunk/java/modules/tests/src/org/apache/
    webservices/sandesha/trunk/java/modules/tests/tests.build.xml
Removed:
    webservices/sandesha/trunk/java/modules/samples/conf/
    webservices/sandesha/trunk/java/modules/samples/src/sandesha2/
    webservices/sandesha/trunk/java/modules/tests/src/org/
Modified:
    webservices/sandesha/trunk/java/maven.xml
    webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
    webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
    webservices/sandesha/trunk/java/pom.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=534564&r1=534563&r2=534564
==============================================================================
--- webservices/sandesha/trunk/java/maven.xml (original)
+++ webservices/sandesha/trunk/java/maven.xml Wed May  2 10:36:15 2007
@@ -337,8 +337,8 @@
         
         <ant:mkdir dir="${dir.sample.userguide.temp}" />
         <ant:mkdir dir="${dir.sample.userguide.temp}/META-INF" />
-        <ant:copy file="${dir.samples}/conf/userguide/services.xml" todir="${dir.sample.userguide.temp}/META-INF" /> 
-        <!-- <ant:copy file="${dir.samples}/conf/userguide/RMSampleService.wsdl" todir="${dir.sample.userguide.temp}" /> --> 
+        <ant:copy file="${dir.samples}/src/main/resources/userguide/services.xml" todir="${dir.sample.userguide.temp}/META-INF" /> 
+        <!-- <ant:copy file="${dir.samples}/src/main/resources/userguide/RMSampleService.wsdl" todir="${dir.sample.userguide.temp}" /> --> 
         <ant:copy todir="${dir.sample.userguide.temp}" >
             <ant:fileset dir="${maven.build.dir}/samples/classes">
                 <ant:include name="sandesha2/samples/userguide/**/*Service*.class" />

Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java?view=diff&rev=534564&r1=534563&r2=534564
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java Wed May  2 10:36:15 2007
@@ -83,7 +83,7 @@
 		
 		if (propertyBean==null) {
 			String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.couldNotLoadModulePolicies);
-			log.error (message);
+			log.warn (message);
 			
 			propertyBean = PropertyManager.loadPropertiesFromDefaultValues();
 		} else {

Added: webservices/sandesha/trunk/java/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/samples/pom.xml?view=auto&rev=534564
==============================================================================
--- webservices/sandesha/trunk/java/modules/samples/pom.xml (added)
+++ webservices/sandesha/trunk/java/modules/samples/pom.xml Wed May  2 10:36:15 2007
@@ -0,0 +1,84 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.apache.sandesha2</groupId>
+        <artifactId>sandesha2-parent</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>sandesha2-samples</artifactId>
+    <packaging>jar</packaging>
+    <name>Sandesha2 - Samples</name>
+
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <testSourceDirectory>src/main/java</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                    <include>**/*.xsl</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                </configuration>
+            </plugin>
+			
+			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>create_samples</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+								<ant antfile="samples.build.xml" target="sample:userguide:create" />
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+    
+	<properties>
+	    <test.property>2.8.1</test.property>
+    </properties>
+	
+    <dependencies>
+    	<dependency>
+            <groupId>org.apache.sandesha2</groupId>
+            <artifactId>sandesha2-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+    	<dependency>
+            <groupId>org.apache.sandesha2</groupId>
+            <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>

Added: webservices/sandesha/trunk/java/modules/samples/samples.build.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/samples/samples.build.xml?view=auto&rev=534564
==============================================================================
--- webservices/sandesha/trunk/java/modules/samples/samples.build.xml (added)
+++ webservices/sandesha/trunk/java/modules/samples/samples.build.xml Wed May  2 10:36:15 2007
@@ -0,0 +1,48 @@
+<project>
+
+	<target name="samples:setup">
+		<mkdir dir="target/aars" />
+		<mkdir dir="target/jars" />
+		<mkdir dir="target/temp" />
+	</target>
+	<target name="sample:userguide:create" depends="samples:setup">
+
+		<property name="dir.sample.userguide.temp" value="target/temp/userguide" />
+		<property name="dir.sample.userguide.clients.temp" value="target/temp/userguideclients" />	
+		<property name="dir.sample.userguide.clients.temp" value="target/temp/userguideclients" />	
+		<property name="userguide.service.aar.name" value="RMSampleService.aar" />
+		<property name="userguide.client.jar.name" value="UserguideSampleClients.jar" />
+        <property name="build.samples.clients.dir" value="target/sampleClients" />
+		
+		<mkdir dir="${dir.sample.userguide.temp}/META-INF" />
+		
+        <copy file="src/main/resources/userguide/services.xml" todir="${dir.sample.userguide.temp}/META-INF" /> 
+        <!-- <copy file="src/main/resources/userguide/RMSampleService.wsdl" todir="${dir.sample.userguide.temp}" /> -->
+        <copy todir="${dir.sample.userguide.temp}" >
+            <fileset dir="target/classes">
+                <include name="sandesha2/samples/userguide/**/*Service*.class" />
+            </fileset>
+        </copy>
+		
+        <mkdir dir="${dir.sample.userguide.clients.temp}" /> 
+        <copy todir="${dir.sample.userguide.clients.temp}" >
+            <fileset dir="target/classes">
+                <include name="sandesha2/samples/userguide/**/*Client*.class" />
+            </fileset>
+        </copy>
+        
+        <jar jarfile="target/aars/${userguide.service.aar.name}" basedir="${dir.sample.userguide.temp}" />
+    	<jar jarfile="target/jars/${userguide.client.jar.name}" basedir="${dir.sample.userguide.clients.temp}" />
+    	 
+		<mkdir dir="${build.samples.clients.dir}" />
+    	<copy todir="${build.samples.clients.dir}" >
+            <fileset dir="src/main/resources/userguide">
+                <include name="*.bat" />
+                <include name="*.sh" />
+                <include name="*.html" />
+            </fileset>
+        </copy>
+		
+	</target>
+
+</project>
\ No newline at end of file

Added: webservices/sandesha/trunk/java/modules/tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/pom.xml?view=auto&rev=534564
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/pom.xml (added)
+++ webservices/sandesha/trunk/java/modules/tests/pom.xml Wed May  2 10:36:15 2007
@@ -0,0 +1,95 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.apache.sandesha2</groupId>
+        <artifactId>sandesha2-parent</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>sandesha2-tests</artifactId>
+    <packaging>jar</packaging>
+    <name>Sandesha2 - Test Suite</name>
+
+    <build>
+        <sourceDirectory>src/test/java</sourceDirectory>
+        <testSourceDirectory>src/test/java</testSourceDirectory>
+        <testResources>
+            <testResource>
+                <directory>test-resources</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                    <include>**/*.xsl</include>
+                </includes>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                </configuration>
+            </plugin>
+			
+			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>create_test_repos</id>
+                        <phase>process-test-resources</phase>
+                        <configuration>
+                            <tasks>
+								<ant antfile="tests.build.xml" inheritAll="true" target="repo:create">
+									<property name="sandesha2.version" value="${sandesha2.version}"/>
+									<property name="build.dir" value="${project.build.directory}"/>
+									<property name="local.repo" value="${settings.localRepository}"/>
+									<property name="addressing.version" value="${axis2.version}"/>
+									<property name="rampart.version" value="${rampart.version}"/>
+								</ant>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+    
+	<properties>
+	    <test.property>2.8.1</test.property>
+    </properties>
+	
+    <dependencies>
+    	<dependency>
+            <groupId>org.apache.sandesha2</groupId>
+            <artifactId>sandesha2-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+    	<dependency>
+            <groupId>org.apache.sandesha2</groupId>
+            <artifactId>sandesha2-policy</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+		<dependency>
+            <groupId>org.apache.sandesha2</groupId>
+            <artifactId>sandesha2-samples</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/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java?view=diff&rev=534564&r1=534554&r2=534564
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java (original)
+++ webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java Wed May  2 10:36:15 2007
@@ -79,7 +79,7 @@
     public SandeshaTestCase(String name) {
         super(name);
         File baseDir = new File("");
-        String testRource = baseDir.getAbsolutePath() + File.separator + "modules" + File.separator + "tests" + File.separator + "test-resources";
+        String testRource = "target" + File.separator + "test-classes";
         resourceDir = new File(testRource).getPath();
         
         String propFileStr = resourceDir + File.separator + PROPERTY_FILE_NAME;

Added: 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=auto&rev=534564
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/tests.build.xml (added)
+++ webservices/sandesha/trunk/java/modules/tests/tests.build.xml Wed May  2 10:36:15 2007
@@ -0,0 +1,120 @@
+<project>
+
+	<target name="repo:create" depends="test:aars:create,server:create,client:create,serialize:create,secure:create" />
+		
+	<target name="test:aars:create">
+	</target>
+	
+	<target name="server:create" >
+		
+		<property name="build.repo.dir" value="${build.dir}/repos" />
+		<property name="server.dist.path" value="${build.repo.dir}/server" />
+		
+		<property name="repo.addressing.mar" value="${local.repo}/org/apache/axis2/addressing/${addressing.version}/addressing-${addressing.version}.mar" />
+		<property name="repo.rampart.mar" value="${local.repo}/org/apache/rampart/rampart/${rampart.version}/rampart-${rampart.version}.mar" />
+			
+		<mkdir dir="${server.dist.path}" />
+		<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}/../mar/target/sandesha2-${sandesha2.version}.mar" todir="${server.dist.path}/modules" /> 
+		
+		<copy todir="${server.dist.path}/services" >
+            <fileset dir="../samples/target/aars">
+                <include name="**/*.aar" />
+            </fileset>
+        </copy>
+       
+		<!-- Copying dependent mar files --> 
+        <copy file="${repo.addressing.mar}" toDir="${server.dist.path}/modules/" />
+		<copy file="${repo.rampart.mar}" toDir="${server.dist.path}/modules/" />
+		
+	</target>
+
+	<target name="client:create">
+
+		<property name="build.repo.dir" value="${build.dir}/repos" />
+		<property name="client.dist.path" value="${build.repo.dir}/client" />
+		
+		<property name="repo.addressing.mar" value="${local.repo}/org/apache/axis2/addressing/${addressing.version}/addressing-${addressing.version}.mar" />
+		<property name="repo.rampart.mar" value="${local.repo}/org/apache/rampart/rampart/${rampart.version}/rampart-${rampart.version}.mar" />
+			
+		<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}/../mar/target/sandesha2-${sandesha2.version}.mar" todir="${client.dist.path}/modules" />
+		
+		<!-- Copying dependent mar files --> 
+		<copy file="${repo.addressing.mar}" toDir="${client.dist.path}/modules/" />    
+		<copy file="${repo.rampart.mar}" toDir="${client.dist.path}/modules/" />
+
+	</target>
+	
+	<target name="serialize:create">
+
+		<property name="serialize.client.path" value="${build.dir}/repos/serialize-client"/>
+		<property name="serialize.server.path" value="${build.dir}/repos/serialize-server"/>
+         
+		<property name="serialize.temp.path" value="${build.dir}/temp/serialize" />
+		<mkdir dir="${serialize.temp.path}" />
+				
+		<copy todir="${serialize.client.path}">
+		  <fileset dir="${build.dir}/repos/client">
+		    <exclude name="modules/sandesha2*.mar"/>
+		  </fileset>
+		</copy>
+
+		<copy todir="${serialize.server.path}">
+		  <fileset dir="${build.dir}/repos/server">
+		    <exclude name="modules/sandesha2*.mar"/>
+		  </fileset>
+		</copy>
+
+		<!-- Switch on serialization in the module.xml file -->
+		<unjar src="../mar/target/sandesha2-${sandesha2.version}.mar" dest="${serialize.temp.path}"/>
+		<replace file="${serialize.temp.path}/META-INF/module.xml" 
+		  token="&lt;!-- &lt;sandesha2:UseMessageSerialization>true&lt;/sandesha2:UseMessageSerialization> -->"
+		  value="&lt;sandesha2:UseMessageSerialization>true&lt;/sandesha2:UseMessageSerialization>"/>
+		<jar jarfile="${serialize.client.path}/modules/sandesha2-UnitTest.mar" basedir="${serialize.temp.path}"/>
+		<jar jarfile="${serialize.server.path}/modules/sandesha2-UnitTest.mar" basedir="${serialize.temp.path}"/>
+		
+		<delete dir="${build.temp.dir}"/>
+
+	</target>
+
+	<target name="secure:create">
+
+		<property name="secure.client.path" value="${build.dir}/repos/secure-client"/>
+		<property name="secure.server.path" value="${build.dir}/repos/secure-server"/>
+         
+		<property name="secure.temp.path" value="${build.dir}/temp/secure" />
+		<mkdir dir="${secure.temp.path}" />
+				
+		<copy todir="${secure.client.path}">
+		  <fileset dir="${build.dir}/repos/client">
+		    <exclude name="modules/sandesha2*.mar"/>
+		  </fileset>
+		</copy>
+
+		<copy todir="${secure.server.path}">
+		  <fileset dir="${build.dir}/repos/server">
+		    <exclude name="modules/sandesha2*.mar"/>
+		  </fileset>
+		</copy>
+
+		<!-- Replace the security manager in the module.xml file -->
+		<unjar src="../mar/target/sandesha2-${sandesha2.version}.mar" dest="${secure.temp.path}"/>
+		<replace file="${secure.temp.path}/META-INF/module.xml" 
+			token="dummy.DummySecurityManager"  value="UnitTestSecurityManager"/>
+		<jar jarfile="${secure.client.path}/modules/sandesha2-UnitTest.mar" basedir="${secure.temp.path}"/>
+		<jar jarfile="${secure.server.path}/modules/sandesha2-UnitTest.mar" basedir="${secure.temp.path}"/>
+		
+		<delete dir="${build.temp.dir}"/>
+
+	</target>
+
+</project>
+
+

Modified: webservices/sandesha/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/pom.xml?view=diff&rev=534564&r1=534563&r2=534564
==============================================================================
--- webservices/sandesha/trunk/java/pom.xml (original)
+++ webservices/sandesha/trunk/java/pom.xml Wed May  2 10:36:15 2007
@@ -1,82 +1,81 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.sandesha2</groupId>
-    <artifactId>sandesha2-parent</artifactId>
-    <packaging>pom</packaging>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.sandesha2</groupId>
+    <artifactId>sandesha2-parent</artifactId>
+    <packaging>pom</packaging>
     <description>
-Sandesha2 is an implementation of WS-ReliableMessaging specifications for Apache Axis2. By using Sandesha2 you can add reliable messaging capability to the Web services you have hosted in Axis2. You can also use Sandesha2 with Axis2 client to interact with already hosted web services in a reliable manner. Please see Sandesha2 user guide for more information on using Sandesha2. Read Sandesha2 Architecture guide to see how Sandesha2 works internally.
-    </description>
-    <version>SNAPSHOT</version>
-    <name>Apache Sandesha</name>
-    <url>http://ws.apache.org/ws-fx/sandesha/sandesha2</url>
-
-    <licenses>
-        <license>
-            <name>Apache License Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <organization>
-        <name>Apache Software Foundation</name>
-        <url>http://www.apache.org</url>
-    </organization>
-
-    <issueManagement>
-        <system>JIRA</system>
-        <url>http://issues.apache.org/jira/browse/SANDESHA2</url>
+Sandesha2 is an implementation of WS-ReliableMessaging specifications for Apache Axis2. By using Sandesha2 you can add reliable messaging capability to the Web services you have hosted in Axis2. You can also use Sandesha2 with Axis2 client to interact with already hosted web services in a reliable manner. Please see Sandesha2 user guide for more information on using Sandesha2. Read Sandesha2 Architecture guide to see how Sandesha2 works internally.
+    </description>
+    <version>SNAPSHOT</version>
+    <name>Apache Sandesha</name>
+    <url>http://ws.apache.org/ws-fx/sandesha/sandesha2</url>
+
+    <licenses>
+        <license>
+            <name>Apache License Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+    </organization>
+
+    <issueManagement>
+        <system>JIRA</system>
+        <url>http://issues.apache.org/jira/browse/SANDESHA2</url>
     </issueManagement>
 
-    <mailingLists>
-        <mailingList>
-            <name>Sandesha Developer List</name>
-            <subscribe>sandesha-dev-subscribe@ws.apache.org</subscribe>
-            <unsubscribe>sandesha-dev-unsubscribe@ws.apache.org</unsubscribe>
-            <archive></archive>
-        </mailingList>
+    <mailingLists>
+        <mailingList>
+            <name>Sandesha Developer List</name>
+            <subscribe>sandesha-dev-subscribe@ws.apache.org</subscribe>
+            <unsubscribe>sandesha-dev-unsubscribe@ws.apache.org</unsubscribe>
+            <archive/>
+        </mailingList>
     </mailingLists>
     <inceptionYear>2005</inceptionYear>
-
-    <developers>
-        <developer>
-            <name>Chamikara Jayalath</name>
-            <id>chamikara</id>
-            <email>chamikaramj AT gmail.com</email>
-            <organization>WSO2</organization>
-        </developer>
-        <developer>
-            <name>Davanum Srinivas</name>
-            <id>dims</id>
-            <email>dims AT wso2.com</email>
-            <organization>WSO2</organization>
-        </developer>
-        <developer>
-            <name>Jaliya Ekanayake</name>
-            <id>jaliya</id>
-            <email>jaliya AT opensource.lk</email>
-            <organization>Indiana University, USA</organization>
-            <url>http://www.apache.org/~jaliya</url>
-        </developer>
-        <developer>
-            <name>Sanjiva Weerawarana</name>
-            <id>sanjiva</id>
-            <email>sanjiva AT wso2.com</email>
-            <organization>WSO2</organization>
+
+    <developers>
+        <developer>
+            <name>Chamikara Jayalath</name>
+            <id>chamikara</id>
+            <email>chamikaramj AT gmail.com</email>
+            <organization>WSO2</organization>
+        </developer>
+        <developer>
+            <name>Davanum Srinivas</name>
+            <id>dims</id>
+            <email>dims AT wso2.com</email>
+            <organization>WSO2</organization>
+        </developer>
+        <developer>
+            <name>Jaliya Ekanayake</name>
+            <id>jaliya</id>
+            <email>jaliya AT opensource.lk</email>
+            <organization>Indiana University, USA</organization>
+            <url>http://www.apache.org/~jaliya</url>
+        </developer>
+        <developer>
+            <name>Sanjiva Weerawarana</name>
+            <id>sanjiva</id>
+            <email>sanjiva AT wso2.com</email>
+            <organization>WSO2</organization>
         </developer>
 		<developer>
             <name>Sanka Samaranayaka</name>
             <id>sanka</id>
             <email>ssanka AT gmail.com</email>
             <organization>WSO2</organization>
-        </developer>
-        <developer>
-            <name>Andrew K Gatford</name>
-            <id>gatfora</id>
-            <email>GATFORA AT uk.ibm.com</email>
-            <organization>IBM</organization>
+        </developer>
+        <developer>
+            <name>Andrew K Gatford</name>
+            <id>gatfora</id>
+            <email>GATFORA AT uk.ibm.com</email>
+            <organization>IBM</organization>
         </developer>
 		<developer>
             <name>Thomas McKiernan</name>
@@ -92,73 +91,6 @@
         </developer>
     </developers>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/sandesha/trunk/java/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/sandesha/trunk/java/</developerConnection>
-        <url>http://svn.apache.org/repos/asf/webservices/sandesha/trunk</url>
-    </scm>
-
-    <repositories>
-        <repository>
-            <releases>
-                <enabled>false</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>warn</checksumPolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
-            <id>apache-snapshots</id>
-            <name>Apache Maven2 SNAPSHOTS</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-        </repository>
-        <repository>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>warn</checksumPolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-                <checksumPolicy>warn</checksumPolicy>
-            </snapshots>
-            <id>apache-ws-snapshots2</id>
-            <name>Apache ws.zones - 2</name>
-            <url>http://ws.zones.apache.org/repository2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>snapshot-apache</id>
-            <name>Apache Snapshot repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-
-        <pluginRepository>
-            <id>snapshot</id>
-            <name>Snapshot repository</name>
-            <url>http://snapshots.maven.codehaus.org/maven2</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-
-    </pluginRepositories>
-
     <build>
         <plugins>
 
@@ -180,8 +112,74 @@
         </plugins>
     </build>
 
-
-    <dependencies>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/sandesha/trunk/java/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/sandesha/trunk/java/</developerConnection>
+        <url>http://svn.apache.org/repos/asf/webservices/sandesha/trunk</url>
+    </scm>
+
+    <repositories>
+        <repository>
+            <releases>
+                <enabled>false</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </snapshots>
+            <id>apache-snapshots</id>
+            <name>Apache Maven2 SNAPSHOTS</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <layout>default</layout>
+        </repository>
+        <repository>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
+            </snapshots>
+            <id>apache-ws-snapshots2</id>
+            <name>Apache ws.zones - 2</name>
+            <url>http://ws.zones.apache.org/repository2</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>snapshot-apache</id>
+            <name>Apache Snapshot repository</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
+
+        <pluginRepository>
+            <id>snapshot</id>
+            <name>Snapshot repository</name>
+            <url>http://snapshots.maven.codehaus.org/maven2</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
+
+    </pluginRepositories>
+
+    <dependencies>
 
 		<!-- Axis2 -->
         <dependency>
@@ -196,294 +194,297 @@
         </dependency>
 		
 		<!-- Rampart -->
-        <dependency>
-            <groupId>org.apache.rampart</groupId>
-            <artifactId>rampart-core</artifactId>
-            <version>${rampart.version}</version>
+        <dependency>
+            <groupId>org.apache.rampart</groupId>
+            <artifactId>rampart-core</artifactId>
+            <version>${rampart.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.rampart</groupId>
+        <dependency>
+            <groupId>org.apache.rampart</groupId>
             <artifactId>rampart-trust</artifactId>
-            <version>${rampart.version}</version>
+            <version>${rampart.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.rampart</groupId>
-            <artifactId>rampart-policy</artifactId>
-            <version>${rampart.version}</version>
-        </dependency>
-
-        <!-- AXIOM -->
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>${axiom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>${axiom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-dom</artifactId>
-            <version>${axiom.version}</version>
-        </dependency>
-
-        <!-- Other third party dependencies -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${commons.logging.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>${commons.httpclient.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>${commons.collections.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-discovery</groupId>
-            <artifactId>commons-discovery</artifactId>
-            <version>${commons.discovery.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${commons.codec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${stax.impl.groupid}</groupId>
-            <artifactId>${stax.impl.artifactid}</artifactId>
-            <version>${stax.impl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>${stax.api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>${xml.apis.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.woden</groupId>
-            <artifactId>woden</artifactId>
-            <version>${woden.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <version>${wsdl4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>${javamail.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>${activation.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-            <version>${xbean.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.security</groupId>
-            <artifactId>wss4j</artifactId>
-            <version>${wss4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xml-security</groupId>
-            <artifactId>xmlsec</artifactId>
-            <version>${xmlsec.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>${jaxen.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-            <version>${backport_util_concurrent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servletapi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.schema</groupId>
-            <artifactId>XmlSchema</artifactId>
-            <version>${XmlSchema.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>annogen</groupId>
-            <artifactId>annogen</artifactId>
-            <version>${annogen.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-nodeps</artifactId>
-            <version>${ant.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.neethi</groupId>
-            <artifactId>neethi</artifactId>
-            <version>${neethi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>httpcomponents-httpcore</groupId>
-            <artifactId>jakarta-httpcore</artifactId>
-            <version>${jakarta.httpcore.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>opensaml</groupId>
-            <artifactId>opensaml</artifactId>
-            <version>${opensaml.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <version>${xalan.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>${xml.apis.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>addressing</artifactId>
-            <type>mar</type>
-            <version>${addressing.mar.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>${commons.fileupload.version}</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>jdk14</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <jdk>1.4</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcprov-jdk13</artifactId>
-                    <version>${bcprov.jdk13.version}</version>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15</artifactId>
-                    <version>${bcprov.jdk15.version}</version>
-                </dependency>
-            </dependencies>
-        </profile>
-
-    </profiles>
-
+        <dependency>
+            <groupId>org.apache.rampart</groupId>
+            <artifactId>rampart-policy</artifactId>
+            <version>${rampart.version}</version>
+        </dependency>
+
+        <!-- AXIOM -->
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+            <version>${axiom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-api</artifactId>
+            <version>${axiom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-dom</artifactId>
+            <version>${axiom.version}</version>
+        </dependency>
+
+        <!-- Other third party dependencies -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons.logging.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>${commons.httpclient.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>${commons.collections.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-discovery</groupId>
+            <artifactId>commons-discovery</artifactId>
+            <version>${commons.discovery.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons.codec.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${stax.impl.groupid}</groupId>
+            <artifactId>${stax.impl.artifactid}</artifactId>
+            <version>${stax.impl.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax.api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>${xml.apis.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.woden</groupId>
+            <artifactId>woden</artifactId>
+            <version>${woden.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>${wsdl4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>${javamail.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>${activation.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+            <version>${xbean.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.security</groupId>
+            <artifactId>wss4j</artifactId>
+            <version>${wss4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xml-security</groupId>
+            <artifactId>xmlsec</artifactId>
+            <version>${xmlsec.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <version>${jaxen.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>${backport_util_concurrent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>${servletapi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+            <version>${XmlSchema.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>annogen</groupId>
+            <artifactId>annogen</artifactId>
+            <version>${annogen.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant-nodeps</artifactId>
+            <version>${ant.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>${neethi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>httpcomponents-httpcore</groupId>
+            <artifactId>jakarta-httpcore</artifactId>
+            <version>${jakarta.httpcore.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>opensaml</groupId>
+            <artifactId>opensaml</artifactId>
+            <version>${opensaml.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>${xalan.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>${xerces.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>${xml.apis.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>addressing</artifactId>
+            <type>mar</type>
+            <version>${addressing.mar.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>${commons.fileupload.version}</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>jdk14</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <jdk>1.4</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk13</artifactId>
+                    <version>${bcprov.jdk13.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15</artifactId>
+                    <version>${bcprov.jdk15.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
+    </profiles>
+
     <modules>
-		<!--<module>modules/samples</module>-->
-		<module>modules/interop</module>
-        <module>modules/core</module>
+		<module>modules/samples</module>
+		<module>modules/interop</module>
+       	<module>modules/core</module>
 		<module>modules/mar</module>
 		<module>modules/client</module>
 		<module>modules/policy</module>
+		<module>modules/tests</module>
 		<module>modules/distribution</module>
-    </modules>
+  	</modules>
 
     <properties>
-		<rampart.version>SNAPSHOT</rampart.version>
-        <axis2.version>SNAPSHOT</axis2.version>
-        <axiom.version>SNAPSHOT</axiom.version>
-        <addressing.mar.version>SNAPSHOT</addressing.mar.version>
-        <wss4j.version>SNAPSHOT</wss4j.version>
-        <xmlsec.version>1.3.0</xmlsec.version>
-        <opensaml.version>1.1</opensaml.version>
-        <XmlSchema.version>SNAPSHOT</XmlSchema.version>
-        <neethi.version>2.0</neethi.version>
-        <xbean.version>2.1.0</xbean.version>
-        <woden.version>1.0-incubating-SNAPSHOT</woden.version>
-        <wsdl4j.version>1.6.1</wsdl4j.version>
-        <annogen.version>0.1.0</annogen.version>
-        <activation.version>1.1</activation.version>
-        <javamail.version>1.4</javamail.version>
-        <jaxen.version>1.1-beta-10</jaxen.version>
-        <stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
-        <stax.impl.artifactid>wstx-asl</stax.impl.artifactid>
-        <stax.impl.version>3.2.0</stax.impl.version>
-        <stax.api.version>1.0.1</stax.api.version>
-        <xml.apis.version>1.3.03</xml.apis.version>
-        <bcprov.jdk13.version>132</bcprov.jdk13.version>
-        <bcprov.jdk15.version>132</bcprov.jdk15.version>
-        <commons.codec.version>1.3</commons.codec.version>
-        <commons.httpclient.version>3.0.1</commons.httpclient.version>
-        <commons.logging.version>1.1</commons.logging.version>
-        <backport_util_concurrent.version>2.1</backport_util_concurrent.version>
-        <servletapi.version>2.3</servletapi.version>
-        <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>
-        <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>
-        <ant.version>1.7.0</ant.version>
-        <xalan.version>2.7.0</xalan.version>
-        <xerces.version>2.8.1</xerces.version>
+		<sandesha2.version>SNAPSHOT</sandesha2.version>
+			
+		<rampart.version>SNAPSHOT</rampart.version>
+        <axis2.version>SNAPSHOT</axis2.version>
+        <axiom.version>SNAPSHOT</axiom.version>
+        <addressing.mar.version>SNAPSHOT</addressing.mar.version>
+        <wss4j.version>SNAPSHOT</wss4j.version>
+        <xmlsec.version>1.3.0</xmlsec.version>
+        <opensaml.version>1.1</opensaml.version>
+        <XmlSchema.version>SNAPSHOT</XmlSchema.version>
+        <neethi.version>2.0</neethi.version>
+        <xbean.version>2.1.0</xbean.version>
+        <woden.version>1.0-incubating-SNAPSHOT</woden.version>
+        <wsdl4j.version>1.6.1</wsdl4j.version>
+        <annogen.version>0.1.0</annogen.version>
+        <activation.version>1.1</activation.version>
+        <javamail.version>1.4</javamail.version>
+        <jaxen.version>1.1-beta-10</jaxen.version>
+        <stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
+        <stax.impl.artifactid>wstx-asl</stax.impl.artifactid>
+        <stax.impl.version>3.2.0</stax.impl.version>
+        <stax.api.version>1.0.1</stax.api.version>
+        <xml.apis.version>1.3.03</xml.apis.version>
+        <bcprov.jdk13.version>132</bcprov.jdk13.version>
+        <bcprov.jdk15.version>132</bcprov.jdk15.version>
+        <commons.codec.version>1.3</commons.codec.version>
+        <commons.httpclient.version>3.0.1</commons.httpclient.version>
+        <commons.logging.version>1.1</commons.logging.version>
+        <backport_util_concurrent.version>2.1</backport_util_concurrent.version>
+        <servletapi.version>2.3</servletapi.version>
+        <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>
+        <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>
+        <ant.version>1.7.0</ant.version>
+        <xalan.version>2.7.0</xalan.version>
+        <xerces.version>2.8.1</xerces.version>
     </properties>
-	
-    <distributionManagement>
-        <repository>
-            <id>apache-repo</id>
+	
+    <distributionManagement>
+        <repository>
+            <id>apache-repo</id>
             <name>Maven Central Repository</name>
             <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
         </repository>
-	<!--
-        <snapshotRepository>
-            <id>apache-snapshots</id>
-            <name>Apache Development Repository</name>
-            <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
+	<!--
+        <snapshotRepository>
+            <id>apache-snapshots</id>
+            <name>Apache Development Repository</name>
+            <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-snapshot-repository</url>
         </snapshotRepository>
-	-->
-    </distributionManagement>
-
+	-->
+    </distributionManagement>
+
 </project>

Modified: webservices/sandesha/trunk/java/project.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/project.xml?view=diff&rev=534564&r1=534563&r2=534564
==============================================================================
--- webservices/sandesha/trunk/java/project.xml (original)
+++ webservices/sandesha/trunk/java/project.xml Wed May  2 10:36:15 2007
@@ -83,7 +83,7 @@
     <build>
         <nagEmailAddress>sandesha-dev@ws.apache.org</nagEmailAddress>
         <sourceDirectory>modules/core/src/main/java</sourceDirectory>
-        <unitTestSourceDirectory>modules/tests/src</unitTestSourceDirectory>
+        <unitTestSourceDirectory>modules/tests/src/test/java</unitTestSourceDirectory>
 
         <unitTest>
             <includes>



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org