JBossWS SVN: r12665 - in stack/cxf/trunk: modules/resources/src/main/resources/bin and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-20 08:11:27 -0400 (Tue, 20 Jul 2010)
New Revision: 12665
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBPAPP-4642] applying fix upstream
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-07-20 11:07:54 UTC (rev 12664)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-07-20 12:11:27 UTC (rev 12665)
@@ -83,6 +83,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-expression.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxp-ri.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-07-20 11:07:54 UTC (rev 12664)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-07-20 12:11:27 UTC (rev 12665)
@@ -125,6 +125,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-expression.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxp-ri.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/velocity.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/XmlSchema.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-07-20 11:07:54 UTC (rev 12664)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-07-20 12:11:27 UTC (rev 12665)
@@ -104,6 +104,7 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-expression.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxp-ri.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-07-20 11:07:54 UTC (rev 12664)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-07-20 12:11:27 UTC (rev 12665)
@@ -124,6 +124,7 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-expression.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-impl.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxp-ri.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/velocity.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/XmlSchema.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-07-20 11:07:54 UTC (rev 12664)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-07-20 12:11:27 UTC (rev 12665)
@@ -44,6 +44,7 @@
<include name="**/neethi.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/saaj-impl.jar"/>
+ <include name="**/jaxp-ri.jar"/>
<include name="**/stax-api.jar"/>
<include name="**/velocity.jar"/>
<include name="**/wsdl4j.jar"/>
@@ -82,6 +83,7 @@
<include name="**/neethi.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/saaj-impl.jar"/>
+ <include name="**/jaxp-ri.jar"/>
<include name="**/XmlSchema.jar"/>
<include name="**/xmlsec.jar"/>
<include name="**/wsdl4j.jar"/>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-07-20 11:07:54 UTC (rev 12664)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-07-20 12:11:27 UTC (rev 12665)
@@ -241,6 +241,10 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.xml.bind</groupId>
<artifactId>jboss-jaxb-api_2.2_spec</artifactId>
</dependency>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties 2010-07-20 11:07:54 UTC (rev 12664)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/interop/wstrust10/META-INF/etc/bob.properties 2010-07-20 12:11:27 UTC (rev 12665)
@@ -18,6 +18,6 @@
org.apache.ws.security.crypto.merlin.keystore.type=PKCS12
org.apache.ws.security.crypto.merlin.keystore.password=password
# for some reason, bouncycastle has issues with bob.pfx
-org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE
+#org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE
org.apache.ws.security.crypto.merlin.file=META-INF/certs/bob.pfx
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-07-20 11:07:54 UTC (rev 12664)
+++ stack/cxf/trunk/pom.xml 2010-07-20 12:11:27 UTC (rev 12665)
@@ -86,6 +86,7 @@
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.4.3</xmlsec.version>
<wstx.version>3.2.9</wstx.version>
+ <jaxp.ri.version>1.4.2</jaxp.ri.version>
<spring.version>3.0.3.RELEASE</spring.version>
</properties>
@@ -940,6 +941,11 @@
<version>${saaj.api.version}</version>
</dependency>
<dependency>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
+ <version>${jaxp.ri.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.xml.ws</groupId>
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
<version>${jaxws.api.version}</version>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-20 11:07:54 UTC (rev 12664)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-20 12:11:27 UTC (rev 12665)
@@ -11,6 +11,15 @@
<moduleSet>
<includes>
<include>org.jboss.ws.cxf:jbossws-cxf-client</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
<include>org.jboss.ws.cxf:jbossws-cxf-server</include>
</includes>
<binaries>
@@ -22,6 +31,7 @@
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
+ <include>com.sun.xml.parsers:jaxp-ri:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.xjcplugins:cxf-*</include>
13 years, 9 months
JBossWS SVN: r12664 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-20 07:07:54 -0400 (Tue, 20 Jul 2010)
New Revision: 12664
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultHttpEndpoint.java
Log:
[JBPAPP-4566] applying fix upstream
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultHttpEndpoint.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultHttpEndpoint.java 2010-07-20 09:19:20 UTC (rev 12663)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultHttpEndpoint.java 2010-07-20 11:07:54 UTC (rev 12664)
@@ -24,6 +24,7 @@
import javax.naming.Context;
import javax.naming.NamingException;
+import org.jboss.logging.Logger;
import org.jboss.wsf.common.injection.InjectionException;
import org.jboss.wsf.spi.deployment.HttpEndpoint;
import org.jboss.wsf.spi.management.EndpointMetrics;
@@ -36,6 +37,8 @@
public class DefaultHttpEndpoint extends AbstractDefaultEndpoint implements HttpEndpoint
{
+ private static final Logger log = Logger.getLogger(DefaultHttpEndpoint.class);
+
DefaultHttpEndpoint(String targetBean)
{
super(targetBean);
@@ -75,8 +78,7 @@
}
catch (NamingException e)
{
- final String message = "Cannot get JNDI context";
- InjectionException.rethrow(message, e);
+ log.error("JNDI not available neither in JSE environment nor in SAR archives.", e);
}
return retVal;
13 years, 9 months
JBossWS SVN: r12663 - in stack/native/tags/jbossws-native-3.1.2.SP7: modules/client and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-20 05:19:20 -0400 (Tue, 20 Jul 2010)
New Revision: 12663
Modified:
stack/native/tags/jbossws-native-3.1.2.SP7/modules/client/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP7/modules/core/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxrpc/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxws-ext/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxws/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP7/modules/management/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP7/modules/resources/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP7/modules/saaj/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/native-tests/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP7/pom.xml
Log:
[JBPAPP-4147] fixing tag poms
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/modules/client/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/modules/client/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/modules/client/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/modules/core/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/modules/core/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/modules/core/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxrpc/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxrpc/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxrpc/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxws/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxws/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxws/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxws-ext/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxws-ext/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/modules/jaxws-ext/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/modules/management/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/modules/management/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/modules/management/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/modules/resources/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/modules/resources/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/modules/resources/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/modules/saaj/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/modules/saaj/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/modules/saaj/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/native-tests/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/native-tests/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/modules/testsuite/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP7/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP7/pom.xml 2010-07-20 08:42:32 UTC (rev 12662)
+++ stack/native/tags/jbossws-native-3.1.2.SP7/pom.xml 2010-07-20 09:19:20 UTC (rev 12663)
@@ -17,7 +17,7 @@
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<!-- Parent -->
<parent>
@@ -28,9 +28,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/branches/jbos...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/branches/jbossws-na...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
</scm>
<!-- Modules -->
@@ -47,9 +47,9 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.1.0.SP6</jbossws.common.version>
+ <jbossws.framework.version>3.1.2.SP8</jbossws.framework.version>
+ <jbossws.spi.version>1.1.2.SP4</jbossws.spi.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
13 years, 9 months
JBossWS SVN: r12662 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-20 04:42:32 -0400 (Tue, 20 Jul 2010)
New Revision: 12662
Added:
stack/native/tags/jbossws-native-3.1.2.SP7/
Log:
[JBPAPP-4147] tagging release
Copied: stack/native/tags/jbossws-native-3.1.2.SP7 (from rev 12661, stack/native/branches/jbossws-native-3.1.2)
13 years, 9 months
JBossWS SVN: r12661 - in stack/cxf/tags/jbossws-cxf-3.1.2.SP7: modules/client and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-20 03:49:09 -0400 (Tue, 20 Jul 2010)
New Revision: 12661
Modified:
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/client/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/management/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/resources/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/server/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/cxf-tests/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/pom.xml
Log:
[JBPAPP-4216] fixing poms
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/client/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/client/pom.xml 2010-07-20 07:35:56 UTC (rev 12660)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/client/pom.xml 2010-07-20 07:49:09 UTC (rev 12661)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/management/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/management/pom.xml 2010-07-20 07:35:56 UTC (rev 12660)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/management/pom.xml 2010-07-20 07:49:09 UTC (rev 12661)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/resources/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/resources/pom.xml 2010-07-20 07:35:56 UTC (rev 12660)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/resources/pom.xml 2010-07-20 07:49:09 UTC (rev 12661)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/server/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/server/pom.xml 2010-07-20 07:35:56 UTC (rev 12660)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/server/pom.xml 2010-07-20 07:49:09 UTC (rev 12661)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/cxf-tests/pom.xml 2010-07-20 07:35:56 UTC (rev 12660)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/cxf-tests/pom.xml 2010-07-20 07:49:09 UTC (rev 12661)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml 2010-07-20 07:35:56 UTC (rev 12660)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml 2010-07-20 07:49:09 UTC (rev 12661)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/pom.xml 2010-07-20 07:35:56 UTC (rev 12660)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/pom.xml 2010-07-20 07:49:09 UTC (rev 12661)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/pom.xml 2010-07-20 07:35:56 UTC (rev 12660)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/pom.xml 2010-07-20 07:49:09 UTC (rev 12661)
@@ -17,7 +17,7 @@
<artifactId>jbossws-cxf</artifactId>
<packaging>pom</packaging>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<!-- Parent -->
<parent>
@@ -28,9 +28,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-cx...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/branches/jbossws-cxf-3...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-3....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-3.1.2...</url>
</scm>
<!-- Modules -->
@@ -43,9 +43,9 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.1.0.SP6</jbossws.common.version>
+ <jbossws.framework.version>3.1.2.SP8</jbossws.framework.version>
+ <jbossws.spi.version>1.1.2.SP4</jbossws.spi.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
13 years, 9 months
JBossWS SVN: r12660 - stack/cxf/tags.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-20 03:35:56 -0400 (Tue, 20 Jul 2010)
New Revision: 12660
Added:
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/
Log:
[JBPAPP-4216] creating tag
Copied: stack/cxf/tags/jbossws-cxf-3.1.2.SP7 (from rev 12659, stack/cxf/branches/jbossws-cxf-3.1.2)
13 years, 9 months
JBossWS SVN: r12658 - framework/tags.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-20 03:19:25 -0400 (Tue, 20 Jul 2010)
New Revision: 12658
Added:
framework/tags/jbossws-framework-3.1.2.SP8/
Log:
[JBPAPP-4372] creating release tag
Copied: framework/tags/jbossws-framework-3.1.2.SP8 (from rev 12657, framework/branches/jbossws-framework-3.1.2)
13 years, 9 months
JBossWS SVN: r12657 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-19 14:40:19 -0400 (Mon, 19 Jul 2010)
New Revision: 12657
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java
Log:
[JBPAPP-4610] Ensure Response is also set on handler after an Exception.
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2010-07-19 18:35:58 UTC (rev 12656)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2010-07-19 18:40:19 UTC (rev 12657)
@@ -256,15 +256,15 @@
log.debug("Finished task " + getTaskID().toString() + ": " + result);
response.set(result);
-
- // Call the handler if available
- if (handler != null)
- handler.handleResponse(response);
}
catch (Exception ex)
{
handleAsynInvokeException(ex);
}
+
+ // Call the handler if available
+ if (handler != null)
+ handler.handleResponse(response);
}
// 2.3.4.5 Conformance (Asychronous fault cause): An ExecutionException that is thrown by the get method
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java 2010-07-19 18:35:58 UTC (rev 12656)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java 2010-07-19 18:40:19 UTC (rev 12657)
@@ -130,4 +130,26 @@
}
}
+ public void testEchoFailAsyncFuture_isDone() throws Exception
+ {
+ StringHandler handler = new StringHandler();
+
+ Future future = port.echoAsync("FAIL SLEEP", handler);
+ while (future.isDone() == false)
+ {
+ Thread.sleep(200);
+ }
+
+ try
+ {
+ handler.getResponse().get();
+ fail("Expected 'ExecutionException' not thrown.");
+ }
+ catch (ExecutionException ee)
+ {
+ Exception cause = (Exception)ee.getCause();
+ assertEquals("Cause Type", TestException.class, cause.getClass());
+ }
+ }
+
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java 2010-07-19 18:35:58 UTC (rev 12656)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-4610/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java 2010-07-19 18:40:19 UTC (rev 12657)
@@ -34,8 +34,20 @@
public String echo(String message) throws TestException
{
- if ("FAIL".equals(message))
+ if (message.contains("SLEEP"))
{
+ try
+ {
+ Thread.sleep(5000);
+ }
+ catch (InterruptedException e)
+ {
+ throw new RuntimeException("Unable to sleep", e);
+ }
+ }
+
+ if (message.contains("FAIL"))
+ {
throw new TestException(message);
}
13 years, 9 months
JBossWS SVN: r12656 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: test/java/org/jboss/test/ws/jaxws/jbws3071 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-07-19 14:35:58 -0400 (Mon, 19 Jul 2010)
New Revision: 12656
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java
Log:
[JBPAPP-4515] Ensure Response is also set on handler after an Exception.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2010-07-19 13:17:58 UTC (rev 12655)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2010-07-19 18:35:58 UTC (rev 12656)
@@ -258,15 +258,15 @@
log.debug("Finished task " + getTaskID().toString() + ": " + result);
response.set(result);
-
- // Call the handler if available
- if (handler != null)
- handler.handleResponse(response);
}
catch (Exception ex)
{
handleAsynInvokeException(ex);
}
+
+ // Call the handler if available
+ if (handler != null)
+ handler.handleResponse(response);
}
// 2.3.4.5 Conformance (Asychronous fault cause): An ExecutionException that is thrown by the get method
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java 2010-07-19 13:17:58 UTC (rev 12655)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/JBWS3071TestCase.java 2010-07-19 18:35:58 UTC (rev 12656)
@@ -130,4 +130,26 @@
}
}
+ public void testEchoFailAsyncFuture_isDone() throws Exception
+ {
+ StringHandler handler = new StringHandler();
+
+ Future future = port.echoAsync("FAIL SLEEP", handler);
+ while (future.isDone() == false)
+ {
+ Thread.sleep(200);
+ }
+
+ try
+ {
+ handler.getResponse().get();
+ fail("Expected 'ExecutionException' not thrown.");
+ }
+ catch (ExecutionException ee)
+ {
+ Exception cause = (Exception)ee.getCause();
+ assertEquals("Cause Type", TestException.class, cause.getClass());
+ }
+ }
+
}
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java 2010-07-19 13:17:58 UTC (rev 12655)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws3071/TestEndpointImpl.java 2010-07-19 18:35:58 UTC (rev 12656)
@@ -34,8 +34,20 @@
public String echo(String message) throws TestException
{
- if ("FAIL".equals(message))
+ if (message.contains("SLEEP"))
{
+ try
+ {
+ Thread.sleep(5000);
+ }
+ catch (InterruptedException e)
+ {
+ throw new RuntimeException("Unable to sleep", e);
+ }
+ }
+
+ if (message.contains("FAIL"))
+ {
throw new TestException(message);
}
13 years, 9 months