8:11 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2013-02-19 09:11:37 -0500 (Tue, 19 Feb 2013)
New Revision: 524
Modified:
core/trunk/core-cxf/pom.xml
core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerImpl.java
core/trunk/core/pom.xml
core/trunk/distribution/pom.xml
core/trunk/integration-testsuite/pom.xml
core/trunk/pom.xml
Log:
* [WISE-189] Slimming down dependencies a bit by moving to JBossWS 4.1 series
* adding testsuite profile for running against AS 8.0.0.Alpha1-SNAPSHOT
* adding workaround for CXF-4833
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2013-02-19 13:58:08 UTC (rev 523)
+++ core/trunk/core/pom.xml 2013-02-19 14:11:37 UTC (rev 524)
@@ -111,12 +111,6 @@
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
Modified: core/trunk/core-cxf/pom.xml
===================================================================
--- core/trunk/core-cxf/pom.xml 2013-02-19 13:58:08 UTC (rev 523)
+++ core/trunk/core-cxf/pom.xml 2013-02-19 14:11:37 UTC (rev 524)
@@ -81,12 +81,6 @@
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
Modified:
core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerImpl.java
===================================================================
---
core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerImpl.java 2013-02-19
13:58:08 UTC (rev 523)
+++
core/trunk/core-cxf/src/main/java/org/jboss/wise/core/client/consumer/WiseCXFConsumerImpl.java 2013-02-19
14:11:37 UTC (rev 524)
@@ -36,6 +36,7 @@
* A WSContractConsumer for CXF stack; this is basically a copy of the JBossWS-CXF 4.1.0
* implementation, to early consume the fix for JBWS-3520 which is blocking for Wise 2.0
* on AS 7 as it's the only workaround for WISE-179.
+ * This currently also include a workaround for CXF-4833.
*
* @author alessio.soldano(a)jboss.com
*/
@@ -259,15 +260,16 @@
}
catch (Throwable t)
{
- if (messageStream != null)
- {
- messageStream.println("Failed to invoke WSDLToJava");
- t.printStackTrace(messageStream);
- }
- else
- {
- t.printStackTrace();
- }
- }
+ try {
+ if (messageStream != null) {
+ messageStream.println("Failed to invoke WSDLToJava");
+ t.printStackTrace(messageStream);
+ } else {
+ t.printStackTrace();
+ }
+ } catch (IndexOutOfBoundsException iobe) {
+ //ignore, caused by CXF-4833
+ }
+ }
}
}
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2013-02-19 13:58:08 UTC (rev 523)
+++ core/trunk/distribution/pom.xml 2013-02-19 14:11:37 UTC (rev 524)
@@ -29,6 +29,11 @@
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>1.0.0.Final</version>
+ </dependency>
</dependencies>
<build>
Modified: core/trunk/integration-testsuite/pom.xml
===================================================================
--- core/trunk/integration-testsuite/pom.xml 2013-02-19 13:58:08 UTC (rev 523)
+++ core/trunk/integration-testsuite/pom.xml 2013-02-19 14:11:37 UTC (rev 524)
@@ -50,11 +50,6 @@
</dependency>
<dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
<scope>test</scope>
@@ -145,11 +140,42 @@
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-webservices-tests-integration</artifactId>
<version>7.1.1.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-clustering-infinispan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-transactions</artifactId>
+ </exclusion>
+ </exclusions>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
+ <id>jboss800</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-webservices-tests-integration</artifactId>
+ <version>8.0.0.Alpha1-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-clustering-infinispan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-transactions</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>use.endorsed.dir</id>
<activation>
<property>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2013-02-19 13:58:08 UTC (rev 523)
+++ core/trunk/pom.xml 2013-02-19 14:11:37 UTC (rev 524)
@@ -58,7 +58,11 @@
<surefire.usefile>false</surefire.usefile>
<compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
<checkstyle.extension />
- <cxf.version>2.4.6</cxf.version> <!-- This should stay in synch
with the one used within the jbossws-cxf being pulled in wise-core-cxf -->
+ <milyn.version>1.2.1</milyn.version>
+ <!-- Following should stay in synch with the one used within the jbossws-cxf
being pulled in wise-core-cxf -->
+ <cxf.version>2.6.4</cxf.version>
+ <jaxb.impl.version>2.2.5</jaxb.impl.version>
+ <!-- -->
<compiler.fork>false</compiler.fork>
</properties>
@@ -136,7 +140,19 @@
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
@@ -153,14 +169,14 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>3.1.0.GA</version>
+ <version>3.1.2.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
- <version>2.0.2.GA</version>
+ <version>2.1.1.Final</version>
<exclusions>
<exclusion>
<groupId>jboss.jaxbintros</groupId>
@@ -172,13 +188,13 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
- <version>2.0.3.GA</version>
+ <version>2.1.1.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>4.0.2.GA</version>
+ <version>4.1.1.Final</version>
<exclusions>
<exclusion>
<groupId>org.apache.cxf</groupId>
@@ -197,10 +213,6 @@
<artifactId>woodstox-core-asl</artifactId>
</exclusion>
<exclusion>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
- </exclusion>
- <exclusion>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
</exclusion>
@@ -212,13 +224,29 @@
<groupId>gnu-getopt</groupId>
<artifactId>getopt</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.milyn</groupId>
<artifactId>milyn-smooks-core</artifactId>
- <version>1.2.1</version>
+ <version>${milyn.version}</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -230,19 +258,19 @@
<dependency>
<groupId>org.milyn</groupId>
<artifactId>milyn-smooks-validation</artifactId>
- <version>1.2.1</version>
+ <version>${milyn.version}</version>
</dependency>
<dependency>
<groupId>org.milyn</groupId>
<artifactId>milyn-commons</artifactId>
- <version>1.2.1</version>
+ <version>${milyn.version}</version>
</dependency>
<dependency>
<groupId>org.milyn</groupId>
<artifactId>milyn-smooks-javabean</artifactId>
- <version>1.2.1</version>
+ <version>${milyn.version}</version>
</dependency>
<dependency>
@@ -263,23 +291,23 @@
<version>1.2.16</version>
</dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
+ </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.0</version>
- </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.0</version>
+ </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.1</version>
- </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>1.1</version>
+ </dependency>
<dependency>
<groupId>javax.ejb</groupId>