You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/02/01 16:51:13 UTC
svn commit: r502250 [2/3] - in /webservices/axis2/trunk/java: ./
modules/adb-codegen/
modules/adb-codegen/test/org/apache/axis2/schema/compile/ modules/adb/
modules/addressing/ modules/addressing/test/org/apache/axis2/handlers/util/
modules/codegen/ mo...
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/ProxyDocLitWrappedService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/ProxyDocLitWrappedService.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/ProxyDocLitWrappedService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/doclitwrapped/sei/ProxyDocLitWrappedService.java Thu Feb 1 07:51:10 2007
@@ -29,7 +29,7 @@
URL url = null;
try {
try{
- String baseDir = new File(".").getCanonicalPath();
+ String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
}catch(Exception e){
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/proxy/soap12/SOAP12EchoService.java Thu Feb 1 07:51:10 2007
@@ -18,6 +18,7 @@
*/
package org.apache.axis2.jaxws.proxy.soap12;
+import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
@@ -33,12 +34,21 @@
extends Service
{
+
private final static URL SOAP12ECHOSERVICE_WSDL_LOCATION;
-
+ private static String wsdlLocation = "/test/org/apache/axis2/jaxws/proxy/soap12/server/META-INF/SOAP12Echo.wsdl";
static {
URL url = null;
try {
- url = new URL("file:./target/test-classes/services/SOAP12EchoService/META-INF/SOAP12Echo.wsdl");
+ try{
+ String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
+ wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
+ }catch(Exception e){
+
+ }
+ File file = new File(wsdlLocation);
+ url = file.toURL();
+
} catch (MalformedURLException e) {
e.printStackTrace();
}
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/sei/ResourceInjectionService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/sei/ResourceInjectionService.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/sei/ResourceInjectionService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/resourceinjection/sei/ResourceInjectionService.java Thu Feb 1 07:51:10 2007
@@ -22,7 +22,7 @@
URL url = null;
try {
try{
- String baseDir = new File(".").getCanonicalPath();
+ String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
}catch(Exception e){
e.printStackTrace();
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/MtomSampleTests.java Thu Feb 1 07:51:10 2007
@@ -27,7 +27,7 @@
private static final QName QNAME_SERVICE = new QName("urn://mtom.test.org", "MtomSampleService");
private static final QName QNAME_PORT = new QName("urn://mtom.test.org", "MtomSample");
private static final String URL_ENDPOINT = "http://localhost:8080/axis2/services/MtomSampleService";
- private static final String IMAGE_DIR = "test-resources"+File.separator+"image";
+ private static final String IMAGE_DIR = System.getProperty("basedir",".")+"/"+"test-resources"+File.separator+"image";
/*
* Enable attachment Optimization through the SOAPBinding method
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersService.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/addnumbers/AddNumbersService.java Thu Feb 1 07:51:10 2007
@@ -27,7 +27,7 @@
URL url = null;
try {
try{
- String baseDir = new File(".").getCanonicalPath();
+ String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
}catch(Exception e){
e.printStackTrace();
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbare/sei/BareDocLitService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbare/sei/BareDocLitService.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbare/sei/BareDocLitService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/doclitbare/sei/BareDocLitService.java Thu Feb 1 07:51:10 2007
@@ -28,7 +28,7 @@
URL url = null;
try {
try{
- String baseDir = new File(".").getCanonicalPath();
+ String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
}catch(Exception e){
e.printStackTrace();
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/faults/FaultyWebServiceService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/faults/FaultyWebServiceService.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/faults/FaultyWebServiceService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/faults/FaultyWebServiceService.java Thu Feb 1 07:51:10 2007
@@ -27,7 +27,7 @@
URL url = null;
try {
try{
- String baseDir = new File(".").getCanonicalPath();
+ String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
}catch(Exception e){
e.printStackTrace();
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/faultsservice/FaultsService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/faultsservice/FaultsService.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/faultsservice/FaultsService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/faultsservice/FaultsService.java Thu Feb 1 07:51:10 2007
@@ -27,7 +27,7 @@
URL url = null;
try {
try{
- String baseDir = new File(".").getCanonicalPath();
+ String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
}catch(Exception e){
e.printStackTrace();
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/nonwrap/sei/DocLitNonWrapService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/nonwrap/sei/DocLitNonWrapService.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/nonwrap/sei/DocLitNonWrapService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/nonwrap/sei/DocLitNonWrapService.java Thu Feb 1 07:51:10 2007
@@ -27,7 +27,7 @@
URL url = null;
try {
try{
- String baseDir = new File(".").getCanonicalPath();
+ String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
}catch(Exception e){
e.printStackTrace();
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/parallelasync/server/AsyncService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/parallelasync/server/AsyncService.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/parallelasync/server/AsyncService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/parallelasync/server/AsyncService.java Thu Feb 1 07:51:10 2007
@@ -45,7 +45,7 @@
URL url = null;
try {
try{
- String baseDir = new File(".").getCanonicalPath();
+ String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
}catch(Exception e){
e.printStackTrace();
Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/wrap/sei/DocLitWrapService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/wrap/sei/DocLitWrapService.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/wrap/sei/DocLitWrapService.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/sample/wrap/sei/DocLitWrapService.java Thu Feb 1 07:51:10 2007
@@ -27,7 +27,7 @@
URL url = null;
try {
try{
- String baseDir = new File(".").getCanonicalPath();
+ String baseDir = new File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
}catch(Exception e){
e.printStackTrace();
Added: webservices/axis2/trunk/java/modules/jibx/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/pom.xml?view=auto&rev=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/jibx/pom.xml Thu Feb 1 07:51:10 2007
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<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>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>axis2-jibx</artifactId>
+ <name>Apache Axis 2.0 - JiBX Data Binding</name>
+ <description>JiBX data binding support for Axis 2.0</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/jibx</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/jibx</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jibx</groupId>
+ <artifactId>jibx-bind</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bcel</groupId>
+ <artifactId>bcel</artifactId>
+ <version>5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>jibx</id>
+ <name>Jibx Repository</name>
+ <url>http://jibx.sourceforge.net/maven</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ <build>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <targetPath>../test-resources</targetPath>
+ <directory>test-resources</directory>
+ <includes>
+ <include>**/**</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <tasks>
+ <java classname="org.jibx.binding.Compile" fork="true">
+ <classpath refid="maven.runtime.classpath"/>
+ <classpath location="target/test-classes"/>
+ <arg value="-v"/>
+ <arg value="test-resources/binding/customer-binding.xml"/>
+ <arg value="test-resources/binding/library-binding.xml"/>
+ </java>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>gen-cp</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <tasks>
+ <property name="cp" refid="maven.runtime.classpath" />
+ <echo message="${cp}" file="target/cp.txt" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-antlr</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlrall</artifactId>
+ <version>2.7.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: webservices/axis2/trunk/java/modules/jibx/test/org/apache/axis2/jibx/Test.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/test/org/apache/axis2/jibx/Test.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/test/org/apache/axis2/jibx/Test.java (original)
+++ webservices/axis2/trunk/java/modules/jibx/test/org/apache/axis2/jibx/Test.java Thu Feb 1 07:51:10 2007
@@ -15,7 +15,9 @@
*/
package org.apache.axis2.jibx;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileReader;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
@@ -48,14 +50,14 @@
*/
public class Test extends TestCase
{
- private static final String TEST_CLASSES_DIR = "target/test-classes";
- private static final String OUTPUT_LOCATION_BASE = "target/gen";
+ private static final String TEST_CLASSES_DIR = System.getProperty("basedir",".")+"/target/test-classes";
+ private static final String OUTPUT_LOCATION_BASE = System.getProperty("basedir",".")+"/target/gen";
private static final String OUTPUT_LOCATION_PREFIX = "/test";
- private static final String WSDL_BASE_DIR = "test-resources/wsdl/";
- private static final String BINDING_BASE_DIR = "test-resources/binding/";
- private static final String REPOSITORY_DIR = "test-resources/repo/";
- private static final String CLASSES_DIR = "/target/classes/";
- private static final String[] moduleNames= {"common", "core"};
+ private static final String WSDL_BASE_DIR = System.getProperty("basedir",".")+"/test-resources/wsdl/";
+ private static final String BINDING_BASE_DIR = System.getProperty("basedir",".")+"/test-resources/binding/";
+ private static final String REPOSITORY_DIR = System.getProperty("basedir",".")+"/test-resources/repo/";
+ private static final String CLASSES_DIR = System.getProperty("basedir",".")+"/target/classes/";
+ private static final String[] moduleNames= {"kernel", "core"};
private static final String MODULE_PATH_PREFIX = "../modules/";
private static final String COMPILE_TARGET_NAME = "compile";
private static final String STUB_CLASS =
@@ -177,6 +179,16 @@
* @param outdir
*/
private void compile(String outdir) throws Exception {
+ String cp = null;
+ try{
+ BufferedReader br = new BufferedReader(new FileReader(System.getProperty("basedir",".")+"/target/cp.txt"));
+ cp = br.readLine();
+ }catch(Exception e){
+ // Don't care
+ }
+ if(cp == null){
+ cp = "";
+ }
//using the ant javac task for compilation
Javac javaCompiler = new Javac();
@@ -210,6 +222,8 @@
classPath.add(new Path(codeGenProject,
MODULE_PATH_PREFIX + moduleNames[i] + CLASSES_DIR));
}
+ classPath.add(new Path(codeGenProject, cp));
+
javaCompiler.setClasspath(classPath);
//set sourcePath - The generated output directories also become part of the sourcepath
@@ -236,8 +250,8 @@
compile(outdir);
// finish by testing a roundtrip call to the echo server
- File classesdir = new File(outdir + "/classes");
- URLClassLoader loader = new URLClassLoader(new URL[] {classesdir.toURL()});
+ File classesdir = new File(outdir + "/classes/");
+ URLClassLoader loader = new URLClassLoader(new URL[] {classesdir.toURL()}, this.getClass().getClassLoader());
Class stub = loader.loadClass(STUB_CLASS);
Object inst = stub.newInstance();
Person person = new Person(42, "John", "Smith");
Added: webservices/axis2/trunk/java/modules/json/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/pom.xml?view=auto&rev=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/json/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/json/pom.xml Thu Feb 1 07:51:10 2007
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<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>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>axis2-Json</artifactId>
+ <name>Apache Axis 2.0 - JSON</name>
+ <description>Axis2 JSON module</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/json</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/json</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.0-alpha-1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>test-resources</directory>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?view=auto&rev=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Thu Feb 1 07:51:10 2007
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<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>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/kernel/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/kernel/</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/</url>
+ </scm>
+
+ <artifactId>axis2-kernel</artifactId>
+ <name>Apache Axis 2.0 - Kernel</name>
+ <description>Core Parts of Axis 2.0. This includes Axis 2.0 engine, Client API, Addressing support, etc.,</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-java2wsdl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>jakarta-httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </dependency>
+ <!-- Added this to support WS Policy in Axis2 -->
+ <dependency>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>conf</directory>
+ <excludes>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <targetPath>../test-resources</targetPath>
+ <directory>test-resources</directory>
+ <includes>
+ <include>**/**</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>false</skip>
+ <excludes>
+ <exclude>**/*Abstract*.java</exclude>
+ <exclude>**/*Util*.java</exclude>
+ <exclude>**/*PhaseResolvingTest.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>process-test-resources</id>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/service2"/>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/echo"/>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/invalidservice"/>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/outservice"/>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/module1"/>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/serviceModule"/>
+ <copy file="${basedir}/test-resources/deployment/axis2.xml" tofile="${basedir}/target/test-resources/deployment/axis2.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>test-compile</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <tasks>
+ <property name="maven.build.dir" location="${basedir}/target"/>
+ <ant antfile="j2secbuild.xml" inheritall="true" inheritrefs="true" dir="test-resources/"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-antlr</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlrall</artifactId>
+ <version>2.7.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/BuilderSelectorDeploymentTest.java Thu Feb 1 07:51:10 2007
@@ -36,9 +36,9 @@
}
public void testBuilderSelection() throws AxisFault {
- String repositoryName ="target/test-resources/deployment";
+ String repositoryName =System.getProperty("basedir",".")+"/"+"target/test-resources/deployment";
File repo = new File(repositoryName);
- String xmlFile = "test-resources/deployment/builderSelectorTest/axis2.xml";
+ String xmlFile = System.getProperty("basedir",".")+"/"+"test-resources/deployment/builderSelectorTest/axis2.xml";
File xml = new File(xmlFile);
FileSystemConfigurator fsc = new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
AxisConfiguration axisConfig = fsc.getAxisConfiguration();
@@ -49,9 +49,9 @@
}
public void testBuilderSelectionInvalidEntry() {
- String repositoryName ="target/test-resources/deployment";
+ String repositoryName =System.getProperty("basedir",".")+"/"+"target/test-resources/deployment";
File repo = new File(repositoryName);
- String xmlFile = "test-resources/deployment/builderSelectorTest/bad-axis2.xml";
+ String xmlFile = System.getProperty("basedir",".")+"/"+"test-resources/deployment/builderSelectorTest/bad-axis2.xml";
File xml = new File(xmlFile);
FileSystemConfigurator fsc = new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
AxisFault testFault=null;
Modified: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java Thu Feb 1 07:51:10 2007
@@ -36,9 +36,9 @@
}
public void testBuilderSelection() throws AxisFault {
- String repositoryName ="target/test-resources/deployment";
+ String repositoryName =System.getProperty("basedir",".")+"/"+"target/test-resources/deployment";
File repo = new File(repositoryName);
- String xmlFile = "test-resources/deployment/messageFormatterTest/axis2.xml";
+ String xmlFile = System.getProperty("basedir",".")+"/"+"test-resources/deployment/messageFormatterTest/axis2.xml";
File xml = new File(xmlFile);
FileSystemConfigurator fsc = new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
AxisConfiguration axisConfig = fsc.getAxisConfiguration();
@@ -47,9 +47,9 @@
}
public void testBuilderSelectionInvalidEntry() {
- String repositoryName ="target/test-resources/deployment";
+ String repositoryName =System.getProperty("basedir",".")+"/"+"target/test-resources/deployment";
File repo = new File(repositoryName);
- String xmlFile = "test-resources/deployment/messageFormatterTest/bad-axis2.xml";
+ String xmlFile = System.getProperty("basedir",".")+"/"+"test-resources/deployment/messageFormatterTest/bad-axis2.xml";
File xml = new File(xmlFile);
FileSystemConfigurator fsc = new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
AxisFault testFault=null;
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/SimpleServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/SimpleServer.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/SimpleServer.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/SimpleServer.java Thu Feb 1 07:51:10 2007
@@ -31,7 +31,7 @@
private int port = 8080;
public void init() {
- repositoryDir = System.getProperty("build.repository");
+ repositoryDir = System.getProperty("basedir",".")+"/"+System.getProperty("build.repository");
System.out.println(">> repositoryDir = " + repositoryDir);
String axis2xml = System.getProperty("axis2.config");
Modified: webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/ValidateWSDLTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/ValidateWSDLTests.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/ValidateWSDLTests.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/ValidateWSDLTests.java Thu Feb 1 07:51:10 2007
@@ -42,7 +42,7 @@
* defined on the PortType
*/
public void testValidatePortType() {
- String wsdlRelativeLocation = "test-resources/wsdl/";
+ String wsdlRelativeLocation = System.getProperty("basedir",".")+"/"+"test-resources/wsdl/";
String wsdlFileName = "ValidateWSDL1.wsdl";
String targetNamespace = "http://serverPartial1.checkexception.webfault.annotations/";
Added: webservices/axis2/trunk/java/modules/mtompolicy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mtompolicy/pom.xml?view=auto&rev=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/mtompolicy/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/mtompolicy/pom.xml Thu Feb 1 07:51:10 2007
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<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>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>axis2-mtompolicy</artifactId>
+ <name>Apache Axis 2.0 - MTOM Policy</name>
+ <description>Axis2 : MTOM Policy</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/mtompolicy</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/mtompolicy</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mtompolicy</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testSourceDirectory>test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>test-resources</directory>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: webservices/axis2/trunk/java/modules/mtompolicy/test/org/apache/axis2/policy/model/MTOMAssertionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mtompolicy/test/org/apache/axis2/policy/model/MTOMAssertionTest.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/mtompolicy/test/org/apache/axis2/policy/model/MTOMAssertionTest.java (original)
+++ webservices/axis2/trunk/java/modules/mtompolicy/test/org/apache/axis2/policy/model/MTOMAssertionTest.java Thu Feb 1 07:51:10 2007
@@ -32,7 +32,7 @@
public void testSymmBinding() {
try {
- Policy p = this.getPolicy("test-resources/policy-mtom-security.xml");
+ Policy p = this.getPolicy(System.getProperty("basedir",".")+"/test-resources/policy-mtom-security.xml");
List assertions = (List)p.getAlternatives().next();
boolean isMTOMAssertionFound = false;
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Thu Feb 1 07:51:10 2007
@@ -286,16 +286,36 @@
<repositories>
<repository>
- <id>ws-zones</id>
- <name>Apache WS project zone repo.</name>
- <layout>legacy</layout>
- <url>http://ws.zones.apache.org/repository</url>
+ <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>
+ <enabled>false</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
</releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ <id>apache-ws-snapshots</id>
+ <name>Apache ws.zones</name>
+ <url>http://ws.zones.apache.org/repository/</url>
+ <layout>legacy</layout>
</repository>
</repositories>
@@ -324,17 +344,17 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
- <version>1.2</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
@@ -429,10 +449,15 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
<version>2.1.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ws.jaxme</groupId>
Added: webservices/axis2/trunk/java/modules/saaj-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj-api/pom.xml?view=auto&rev=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj-api/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/saaj-api/pom.xml Thu Feb 1 07:51:10 2007
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<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>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>axis2-saaj-api</artifactId>
+ <name>Apache Axis 2.0 - SAAJ API</name>
+ <description>Axis2 SAAJ API</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/saaj-api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/saaj-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj-api</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.03</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: webservices/axis2/trunk/java/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/pom.xml?view=auto&rev=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/saaj/pom.xml Thu Feb 1 07:51:10 2007
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<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>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>axis2-saaj</artifactId>
+ <name>Apache Axis 2.0 - SAAJ</name>
+ <description>Axis2 SAAJ implementation</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/saaj</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/saaj</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>test-resources</directory>
+ <includes><include>axis2.xml</include></includes>
+ <targetPath>../test-resources/saaj-repo</targetPath>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <systemProperties>
+ <property>
+ <name>javax.xml.soap.MessageFactory</name>
+ <value>org.apache.axis2.saaj.MessageFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.soap.SOAPFactory</name>
+ <value>org.apache.axis2.saaj.SOAPFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.soap.SOAPConnectionFactory</name>
+ <value>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/AttachmentSerializationTest.java Thu Feb 1 07:51:10 2007
@@ -88,7 +88,7 @@
msg.addAttachmentPart(ap);
// Second attachment
- String jpgfilename = "test-resources/axis2.jpg";
+ String jpgfilename = System.getProperty("basedir",".")+"/"+"test-resources/axis2.jpg";
File myfile = new File(jpgfilename);
FileDataSource fds = new FileDataSource(myfile);
DataHandler dh = new DataHandler(fds);
@@ -114,7 +114,7 @@
byte[] b = new byte[15000];
final int lengthRead = fis.read(b);
FileOutputStream fos =
- new FileOutputStream(new File("target/test-resources/atts-op" + (i++) + ".jpg"));
+ new FileOutputStream(new File(System.getProperty("basedir",".")+"/"+"target/test-resources/atts-op" + (i++) + ".jpg"));
fos.write(b, 0, lengthRead);
fos.flush();
fos.close();
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java Thu Feb 1 07:51:10 2007
@@ -121,7 +121,7 @@
factory.setNamespaceAware(true);
DocumentBuilder builder = factory.newDocumentBuilder();
- document = builder.parse(new File("test-resources" + File.separator + "soap-body.xml"));
+ document = builder.parse(new File(System.getProperty("basedir",".")+"/"+"test-resources" + File.separator + "soap-body.xml"));
MessageFactory fact = MessageFactory.newInstance();
SOAPMessage message = fact.createMessage();
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java Thu Feb 1 07:51:10 2007
@@ -68,7 +68,7 @@
DOMSource domSource;
try {
DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document document = builder.parse(new File("test-resources" + File.separator + "soap-part.xml"));
+ Document document = builder.parse(new File(System.getProperty("basedir",".")+"/test-resources" + File.separator + "soap-part.xml"));
domSource = new DOMSource(document);
SOAPMessage message = MessageFactory.newInstance().createMessage();
Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java Thu Feb 1 07:51:10 2007
@@ -61,7 +61,7 @@
public static final QName SERVICE_NAME = new QName("Echo");
public static final QName OPERATION_NAME = new QName("echo");
- public static final String SAAJ_REPO = "target/test-resources/saaj-repo";
+ public static final String SAAJ_REPO = System.getProperty("basedir",".")+"/"+"target/test-resources/saaj-repo";
public IntegrationTest(String name) {
super(name);
@@ -145,7 +145,7 @@
request.addAttachmentPart(textAttach);
//Attach a java.awt.Image object to the SOAP request
- String jpgfilename = "test-resources/axis2.jpg";
+ String jpgfilename = System.getProperty("basedir",".")+"/"+"test-resources/axis2.jpg";
File myfile = new File(jpgfilename);
FileDataSource fds = new FileDataSource(myfile);
DataHandler imageDH = new DataHandler(fds);
@@ -174,7 +174,7 @@
byte[] b = new byte[15000];
final int lengthRead = bais.read(b);
FileOutputStream fos =
- new FileOutputStream(new File("target/test-resources/result" + (i++) + ".jpg"));
+ new FileOutputStream(new File(System.getProperty("basedir",".")+"/"+"target/test-resources/result" + (i++) + ".jpg"));
fos.write(b, 0, lengthRead);
fos.flush();
fos.close();
Added: webservices/axis2/trunk/java/modules/savan/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/pom.xml?view=auto&rev=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/savan/pom.xml Thu Feb 1 07:51:10 2007
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<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>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>savan</artifactId>
+ <packaging>mar</packaging>
+ <name>Apache Axis 2.0 - Savan</name>
+ <description>Publisher/Subscriber implememtation for Axis2</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-adb</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>conf</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>module.xml</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>conf</directory>
+ <includes>
+ <include>savan-config.xml</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>../../</directory>
+ <targetPath>META-INF/</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2.maven2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <includeDependencies>false</includeDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/ConfigurationManagerTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/ConfigurationManagerTest.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/ConfigurationManagerTest.java (original)
+++ webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/ConfigurationManagerTest.java Thu Feb 1 07:51:10 2007
@@ -26,9 +26,7 @@
public class ConfigurationManagerTest extends TestCase {
public void testFromXMLFile () throws SavanException {
-
- File baseDir = new File("");
- String testRource = baseDir.getAbsolutePath() + File.separator + "test-resources";
+ String testRource = System.getProperty("basedir",".") + File.separator + "test-resources";
String testConfigurationFile = testRource + File.separator + "savan-config-test.xml";
File f = new File (testConfigurationFile); //test-resources configuration file.
Modified: webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingExpirationTypesTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingExpirationTypesTest.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingExpirationTypesTest.java (original)
+++ webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingExpirationTypesTest.java Thu Feb 1 07:51:10 2007
@@ -57,8 +57,7 @@
}
private SavanMessageContext getRenewMessage (String name) throws IOException {
- File baseDir = new File("");
- String testRource = baseDir.getAbsolutePath() + File.separator + "test-resources";
+ String testRource = System.getProperty("basedir",".")+ File.separator + "test-resources";
SOAPEnvelope envelope = CommonUtil.getTestEnvelopeFromFile(testRource,name);
Modified: webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingSubscripitonProcessorTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingSubscripitonProcessorTest.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingSubscripitonProcessorTest.java (original)
+++ webservices/axis2/trunk/java/modules/savan/test/org/apache/axis2/savan/EventingSubscripitonProcessorTest.java Thu Feb 1 07:51:10 2007
@@ -95,8 +95,7 @@
}
private SavanMessageContext getSubscriptionMessage () throws IOException {
- File baseDir = new File("");
- String testRource = baseDir.getAbsolutePath() + File.separator + "test-resources";
+ String testRource = System.getProperty("basedir",".")+ File.separator + "test-resources";
SOAPEnvelope envelope = CommonUtil.getTestEnvelopeFromFile(testRource,"eventing-subscription.xml");
@@ -138,8 +137,7 @@
}
private SavanMessageContext getRenewMessage () throws IOException {
- File baseDir = new File("");
- String testRource = baseDir.getAbsolutePath() + File.separator + "test-resources";
+ String testRource = System.getProperty("basedir",".")+ File.separator + "test-resources";
SOAPEnvelope envelope = CommonUtil.getTestEnvelopeFromFile(testRource,"eventing-renew-datetime.xml");
Added: webservices/axis2/trunk/java/modules/spring/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/spring/pom.xml?view=auto&rev=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/spring/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/spring/pom.xml Thu Feb 1 07:51:10 2007
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<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>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>axis2-spring</artifactId>
+ <name>Apache Axis 2.0 - spring</name>
+ <description>spring for Axis 2.0</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/spring</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/spring</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/spring</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.3</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ </build>
+</project>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-aar-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-aar-maven-plugin/pom.xml?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-aar-maven-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-aar-maven-plugin/pom.xml Thu Feb 1 07:51:10 2007
@@ -20,42 +20,66 @@
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.axis2.maven2</groupId>
- <artifactId>axis2-maven-tools</artifactId>
- <version>SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2-aar-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Axis 2 Aar Maven Plugin</name>
+ <groupId>org.apache.axis2.maven2</groupId>
+ <version>SNAPSHOT</version>
<description>
A Maven 2 plugin for creating Axis 2 service archives (aar files)
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/branches/java/maven2/modules/tool/axis2-aar-maven-plugin</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/branches/java/maven2/modules/tool/axis2-aar-maven-plugin</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axis2/branches/java/maven2/modules/tool/axis2-aar-maven-plugin</url>
+ </scm>
+
<dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.0-beta-1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<developers>
<developer>
@@ -90,5 +114,18 @@
</reportSets>
</plugin>
</plugins>
+
</reporting>
+ <distributionManagement>
+ <repository>
+ <id>apache-repo</id>
+ <name>Maven Central Repository</name>
+ <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-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>
+ </distributionManagement>
</project>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-mar-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-mar-maven-plugin/pom.xml?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-mar-maven-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-mar-maven-plugin/pom.xml Thu Feb 1 07:51:10 2007
@@ -20,46 +20,66 @@
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.axis2.maven2</groupId>
- <artifactId>axis2-maven-tools</artifactId>
- <version>SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2-mar-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Axis 2 Mar Maven Plugin</name>
-
+ <groupId>org.apache.axis2.maven2</groupId>
+ <version>SNAPSHOT</version>
+
<description>
A Maven 2 plugin for creating Axis 2 module archives (mar files)
</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/branches/java/maven2/modules/tool/axis2-mar-maven-plugin</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/branches/java/maven2/modules/tool/axis2-mar-maven-plugin</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axis2/branches/java/maven2/modules/tool/axis2-mar-maven-plugin</url>
+ </scm>
+
<dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.0-beta-1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<developers>
<developer>
@@ -95,4 +115,17 @@
</plugin>
</plugins>
</reporting>
+
+ <distributionManagement>
+ <repository>
+ <id>apache-repo</id>
+ <name>Maven Central Repository</name>
+ <url>scpexe://people.apache.org//www/people.apache.org/repo/m2-ibiblio-rsync-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>
+ </distributionManagement>
</project>
Modified: webservices/axis2/trunk/java/modules/tool/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/pom.xml?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/pom.xml Thu Feb 1 07:51:10 2007
@@ -35,14 +35,12 @@
<packaging>pom</packaging>
<scm>
- <connection>http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/tool</connection>
- <developerConnection>https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/tool</developerConnection>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/tool</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/tool</developerConnection>
<url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool</url>
</scm>
<modules>
- <module>axis2-aar-maven-plugin</module>
- <module>axis2-mar-maven-plugin</module>
<module>axis2-java2wsdl-maven-plugin</module>
<module>axis2-wsdl2code-maven-plugin</module>
</modules>
Added: webservices/axis2/trunk/java/modules/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/pom.xml?view=auto&rev=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/xmlbeans/pom.xml Thu Feb 1 07:51:10 2007
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<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>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>axis2-xmlbeans</artifactId>
+ <name>Apache Axis 2.0 - XMLBeans Data Binding</name>
+ <description>XMLBeans data binding support for Axis2</description>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/xmlbeans</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/xmlbeans</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <targetPath>../test-resources</targetPath>
+ <directory>test-resources</directory>
+ <includes>
+ <include>**/**</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>gen-cp</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <tasks>
+ <property name="cp" refid="maven.runtime.classpath" />
+ <echo message="${cp}" file="target/cp.txt" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-antlr</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlrall</artifactId>
+ <version>2.7.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: webservices/axis2/trunk/java/modules/xmlbeans/test/org/apache/axis2/xmlbeans/WSDL2JavaSuccessTestBase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/test/org/apache/axis2/xmlbeans/WSDL2JavaSuccessTestBase.java?view=diff&rev=502250&r1=502249&r2=502250
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/test/org/apache/axis2/xmlbeans/WSDL2JavaSuccessTestBase.java (original)
+++ webservices/axis2/trunk/java/modules/xmlbeans/test/org/apache/axis2/xmlbeans/WSDL2JavaSuccessTestBase.java Thu Feb 1 07:51:10 2007
@@ -28,17 +28,19 @@
import org.apache.tools.ant.taskdefs.Javac;
import org.apache.tools.ant.types.Path;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileReader;
import java.util.HashMap;
import java.util.Map;
public abstract class WSDL2JavaSuccessTestBase extends TestCase{
- public static final String OUTPUT_LOCATION_BASE = "./out_put_classes";
+ public static final String OUTPUT_LOCATION_BASE = System.getProperty("basedir",".")+"/out_put_classes";
public static final String OUTPUT_LOCATION_PREFIX = "/test";
protected static int folderCount = 0;
- public static final String WSDL_BASE_DIR = "test-resources/";
- public static final String CLASSES_DIR = "/target/classes/";
+ public static final String WSDL_BASE_DIR = System.getProperty("basedir",".")+"/test-resources/";
+ public static final String CLASSES_DIR = System.getProperty("basedir",".")+"/target/classes/";
private String[] moduleNames={"xml","common","core"};
private static final String MODULE_PATH_PREFIX = "../modules/";
private static final String COMPILE_TARGET_NAME = "compile";
@@ -172,6 +174,17 @@
* @param outputLocation
*/
private void compile(String outputLocation){
+ String cp = null;
+ try{
+ BufferedReader br = new BufferedReader(new FileReader(System.getProperty("basedir",".")+"/target/cp.txt"));
+ cp = br.readLine();
+ }catch(Exception e){
+ // Don't care
+ }
+ if(cp == null){
+ cp = "";
+ }
+
//using the ant javac task for compilation
Javac javaCompiler = new Javac();
Project codeGenProject = new Project();
@@ -200,6 +213,9 @@
for (int i = 0; i < moduleNames.length; i++) {
classPath.add(new Path(codeGenProject,MODULE_PATH_PREFIX +moduleNames[i]+CLASSES_DIR));
}
+
+ classPath.add(new Path(codeGenProject, cp));
+
javaCompiler.setClasspath(classPath);
//set sourcePath - The generated output directories also become part of the sourcepath
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org