Author: sagara
Date: Mon Aug 29 09:21:01 2011
New Revision: 1162691
URL: http://svn.apache.org/viewvc?rev=1162691&view=rev
Log:
* Updated to use latest JAX-WS 2.2 and JAXB 2.2 versions, but in JDK 1.6 build
still use JAX-WS 2.1 because integrating Java endorsed mechanism with Maven is
bit of complex.
* Enabled JAX-WS code generation tests.
* Updated version of maven-surefire-plugin - Use of older version of this plug
in cause lot of issues running test cases.
Modified:
axis/axis2/java/core/trunk/modules/codegen/pom.xml
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java
axis/axis2/java/core/trunk/modules/parent/pom.xml
Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=1162691&r1=1162690&r2=1162691&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Mon Aug 29 09:21:01 2011
@@ -133,10 +133,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
- <configuration>
- <excludes>
-
<exclude>**/JAXWSCodeGenerationEngineTest.java</exclude>
- </excludes>
+ <configuration>
<includes>
<include>**/*Test.java</include>
</includes>
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1162691&r1=1162690&r2=1162691&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Mon Aug 29 09:21:01
2011
@@ -247,12 +247,12 @@
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
- <version>1.2</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>com.sun.xml.stream.buffer</groupId>
<artifactId>streambuffer</artifactId>
- <version>0.7</version>
+ <version>1.2</version>
</dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=1162691&r1=1162690&r2=1162691&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Mon Aug 29 09:21:01
2011
@@ -147,8 +147,7 @@
<inherited>true</inherited>
<configuration>
<excludes>
- <exclude>**/*Abstract*.java</exclude>
- <exclude>**/JAXWS2WSDLCodegenEngineTest.java</exclude>
+ <exclude>**/*Abstract*.java</exclude>
</excludes>
<includes>
<include>**/*Test.java</include>
Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java?rev=1162691&r1=1162690&r2=1162691&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/java2wsdl/test/org/apache/ws/java2wsdl/jaxws/JAXWS2WSDLCodegenEngineTest.java
Mon Aug 29 09:21:01 2011
@@ -23,19 +23,26 @@ import java.io.File;
import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOptionParser;
public class JAXWS2WSDLCodegenEngineTest extends TestCase {
+
+ private static final Log log = LogFactory
+ .getLog(JAXWS2WSDLCodegenEngineTest.class);
- final String filePath = "./target/";
+ final String filePath = "target/out";
- public void gsetUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
File dir = new File(
filePath.concat("org/apache/ws/java2wsdl/jaxws/jaxws"));
File wsdl = new File(filePath.concat("ServerInfoService.wsdl"));
assertEquals("Generated directory still exists ", false, dir.exists());
assertEquals("Generated WSDL file still exists ", false,
wsdl.exists());
+ dir = new File(filePath);
+ dir.mkdir();
}
public void tearDown() throws Exception {
@@ -61,18 +68,18 @@ public class JAXWS2WSDLCodegenEngineTest
public void testGenerateWithMixOptions() throws Exception {
String[] args = { "-jws", "-verbose", "-cp", "target/test-classes",
"-cn", "org.apache.ws.java2wsdl.jaxws.ServerInfo", "-o",
- "./target" };
+ "./target/out" };
Java2WSDLCommandLineOptionParser commandLineOptionParser = new
Java2WSDLCommandLineOptionParser(
args);
JAXWS2WSDLCodegenEngine engine = new JAXWS2WSDLCodegenEngine(
commandLineOptionParser.getAllOptions(), args);
- engine.generate();
+ engine.generate();
verifyGeneration();
}
public void testGenerateWithAxisOptions() throws Exception {
String[] args = { "-jws", "-cp", "target/test-classes", "-cn",
- "org.apache.ws.java2wsdl.jaxws.ServerInfo", "-o", "./target" };
+ "org.apache.ws.java2wsdl.jaxws.ServerInfo", "-o",
"./target/out" };
Java2WSDLCommandLineOptionParser commandLineOptionParser = new
Java2WSDLCommandLineOptionParser(
args);
JAXWS2WSDLCodegenEngine engine = new JAXWS2WSDLCodegenEngine(
@@ -83,7 +90,7 @@ public class JAXWS2WSDLCodegenEngineTest
public void testGenerateWithJAXWSOptions() throws Exception {
String[] args = { "-jws", "-cp", "target/test-classes", "-cn",
- "org.apache.ws.java2wsdl.jaxws.ServerInfo", "-d", "./target" };
+ "org.apache.ws.java2wsdl.jaxws.ServerInfo", "-d",
"./target/out" };
Java2WSDLCommandLineOptionParser commandLineOptionParser = new
Java2WSDLCommandLineOptionParser(
args);
JAXWS2WSDLCodegenEngine engine = new JAXWS2WSDLCodegenEngine(
@@ -103,9 +110,9 @@ public class JAXWS2WSDLCodegenEngineTest
* exception current version doesn't support for this. Refer
* http://java.net/jira/browse/JAX_WS-360
*/
- assertEquals("Incorrect number of generated files", 4,
- dir.listFiles().length);
- File wsdl = new File(filePath.concat("ServerInfoService.wsdl"));
+ assertEquals("Incorrect number of generated files", true,
+ (dir.listFiles().length >= 2));
+ File wsdl = new File(filePath.concat("/ServerInfoService.wsdl"));
assertEquals("Generated WSDL file does not exists ", true,
wsdl.exists());
wsdl.delete();
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1162691&r1=1162690&r2=1162691&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Mon Aug 29 09:21:01 2011
@@ -92,8 +92,8 @@
<httpcore.version>4.0</httpcore.version>
<intellij.version>5.0</intellij.version>
<jalopy.version>1.5rc3</jalopy.version>
- <jaxb.api.version>2.1</jaxb.api.version>
- <jaxbri.version>2.1.7</jaxbri.version>
+ <jaxb.api.version>2.2.4</jaxb.api.version>
+ <jaxbri.version>2.2.4</jaxbri.version>
<jaxen.version>1.1.1</jaxen.version>
<jettison.version>1.3</jettison.version>
<jibx.version>1.2</jibx.version>
@@ -125,8 +125,8 @@
<failIfNoTests>false</failIfNoTests>
<m2Repository>'${settings.localRepository}'</m2Repository>
<geronimo-spec.jta.version>1.1</geronimo-spec.jta.version>
- <jaxws.tools.version>2.1.3</jaxws.tools.version>
- <jaxws.rt.version>2.1.3</jaxws.rt.version>
+ <jaxws.tools.version>2.2.5</jaxws.tools.version>
+ <jaxws.rt.version>2.2.5</jaxws.rt.version>
</properties>
<mailingLists>
<mailingList>
@@ -969,6 +969,14 @@
<version>${junit.version}</version>
</dependency>
</dependencies>
+ <!-- JDK 1.6 build still use JAX-WS 2.1 because integrating
Java endorsed
+ mechanism with Maven is bit of complex -->
+ <properties>
+ <jaxb.api.version>2.1</jaxb.api.version>
+ <jaxbri.version>2.1.7</jaxbri.version>
+ <jaxws.tools.version>2.1.3</jaxws.tools.version>
+ <jaxws.rt.version>2.1.3</jaxws.rt.version>
+ </properties>
</profile>
</profiles>
<scm>
@@ -1048,7 +1056,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
