JBossWS SVN: r12314 - in stack/native/trunk/modules/testsuite: native-tests/src/test/etc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-24 08:45:20 -0400 (Mon, 24 May 2010)
New Revision: 12314
Modified:
stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/etc/log4j.xml
Log:
[JBWS-3037] using log4j appenders and removing jboss specific classes from log4j configuration
Modified: stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2010-05-24 12:27:52 UTC (rev 12313)
+++ stack/native/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2010-05-24 12:45:20 UTC (rev 12314)
@@ -19,13 +19,10 @@
<!-- ================================= -->
<!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="${log4j.output.dir}/test.log"/>
<param name="Append" value="false"/>
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
<param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
@@ -55,7 +52,7 @@
</category>
<category name="org.jboss.ws.core.MessageTrace">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <priority value="TRACE"/>
</category>
<category name="org.jboss.remoting">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/etc/log4j.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/etc/log4j.xml 2010-05-24 12:27:52 UTC (rev 12313)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/etc/log4j.xml 2010-05-24 12:45:20 UTC (rev 12314)
@@ -19,13 +19,10 @@
<!-- ================================= -->
<!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="${log4j.output.dir}/test.log"/>
<param name="Append" value="false"/>
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
<param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
@@ -55,7 +52,7 @@
</category>
<category name="org.jboss.ws.core.MessageTrace">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <priority value="TRACE"/>
</category>
<category name="org.jboss.remoting">
13 years, 12 months
JBossWS SVN: r12313 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-24 08:27:52 -0400 (Mon, 24 May 2010)
New Revision: 12313
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
Log:
[JBWS-3037] fixing log4j configuration in test
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2010-05-24 11:32:01 UTC (rev 12312)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2010-05-24 12:27:52 UTC (rev 12313)
@@ -94,7 +94,9 @@
cp.append(PS + jbc + FS + "xercesImpl.jar");
cp.append(PS + jbc + FS + "jboss-logging.jar");
- String command = javaCmd + " -Djava.endorsed.dirs=" + jbl + FS + "endorsed -cp " + cp + " " + TestClient.class.getName() + " " + getServerHost();
+ String props = " -Djava.endorsed.dirs=" + jbl + FS + "endorsed ";
+ props += " -Dlog4j.output.dir=" + System.getProperty("log4j.output.dir") + " ";
+ String command = javaCmd + props + " -cp " + cp + " " + TestClient.class.getName() + " " + getServerHost();
ByteArrayOutputStream bout = new ByteArrayOutputStream();
executeCommand(command, bout);
String res = null;
13 years, 12 months
JBossWS SVN: r12312 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder: jaxws and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-24 07:32:01 -0400 (Mon, 24 May 2010)
New Revision: 12312
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
Log:
[JBWS-3031] fixing wsa action computation algorithm (delimeter) plus fixing regression
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2010-05-21 18:15:20 UTC (rev 12311)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2010-05-24 11:32:01 UTC (rev 12312)
@@ -655,9 +655,10 @@
String operationName = wsdlOperation.getName().getLocalPart();
final WSDLProperty faultName = fault.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_FAULT);
+ final String delimeter = this.getDelimeter(prefix);
if (faultName != null && faultName.getValue() != null && !"".equals(faultName.getValue()))
{
- return prefix + operationName + "/Fault/" + faultName.getValue();
+ return prefix + operationName + delimeter + "Fault" + delimeter + faultName.getValue();
}
throw new IllegalStateException();
@@ -665,15 +666,21 @@
private String getActionPrefix(final WSDLInterfaceOperation wsdlOperation)
{
- String tns = wsdlOperation.getName().getNamespaceURI();
- if (!tns.endsWith("/"))
- tns += "/";
-
final String portTypeName = wsdlOperation.getWsdlInterface().getName().getLocalPart();
+ String namespace = wsdlOperation.getName().getNamespaceURI();
+ final String delimeter = this.getDelimeter(namespace);
+
+ if (!namespace.endsWith(delimeter))
+ namespace += delimeter;
- return tns + portTypeName + "/";
+ return namespace + portTypeName + delimeter;
}
+ private String getDelimeter(final String namespace)
+ {
+ return namespace.toLowerCase().startsWith("urn:") ? ":" : "/";
+ }
+
protected void buildFaultMetaData(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation)
{
TypesMetaData typesMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getTypesMetaData();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2010-05-21 18:15:20 UTC (rev 12311)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2010-05-24 11:32:01 UTC (rev 12312)
@@ -292,18 +292,32 @@
return;
}
- // Build endpoint meta data
-
- for (WSDLEndpoint wsdlEndpoint : wsdlService.getEndpoints())
+ WSDLEndpoint wsdlEndpoint = this.getWsdlEndpoint(wsdlDefinitions, epMetaData.getPortName());
+ if (wsdlEndpoint == null)
+ throw new WSException("Cannot find port in wsdl: " + epMetaData.getPortName());
+
+ QName bindingName = wsdlEndpoint.getBinding();
+ WSDLBinding wsdlBinding = wsdlEndpoint.getWsdlService().getWsdlDefinitions().getBinding(bindingName);
+ String bindingType = wsdlBinding.getType();
+ if (Constants.NS_SOAP11.equals(bindingType) || Constants.NS_SOAP12.equals(bindingType))
{
- QName bindingName = wsdlEndpoint.getBinding();
- WSDLBinding wsdlBinding = wsdlEndpoint.getWsdlService().getWsdlDefinitions().getBinding(bindingName);
- String bindingType = wsdlBinding.getType();
- if (Constants.NS_SOAP11.equals(bindingType) || Constants.NS_SOAP12.equals(bindingType))
+ setupOperationsFromWSDL(epMetaData, wsdlEndpoint);
+ }
+ }
+
+ private WSDLEndpoint getWsdlEndpoint(WSDLDefinitions wsdlDefinitions, QName portName)
+ {
+ WSDLEndpoint wsdlEndpoint = null;
+ for (WSDLService wsdlService : wsdlDefinitions.getServices())
+ {
+ WSDLEndpoint auxEndpoint = wsdlService.getEndpoint(portName);
+ if (auxEndpoint != null)
{
- setupOperationsFromWSDL(epMetaData, wsdlEndpoint);
+ wsdlEndpoint = auxEndpoint;
+ break;
}
}
+ return wsdlEndpoint;
}
/**
13 years, 12 months
JBossWS SVN: r12311 - in stack/cxf/trunk: modules/client and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-21 14:15:20 -0400 (Fri, 21 May 2010)
New Revision: 12311
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
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/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-3036] artifact dependencies cleanup
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2010-05-21 16:22:54 UTC (rev 12310)
+++ stack/cxf/trunk/modules/client/pom.xml 2010-05-21 18:15:20 UTC (rev 12311)
@@ -141,8 +141,8 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
@@ -170,6 +170,11 @@
<artifactId>jaxrpc-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </dependency>
+
<!-- jboss provided -->
<dependency>
<groupId>org.jboss</groupId>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-05-21 16:22:54 UTC (rev 12310)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-05-21 18:15:20 UTC (rev 12311)
@@ -43,6 +43,7 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar
rem stack specific libs
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-cxf-client.jar
@@ -72,7 +73,6 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-wsdlto-frontend-jaxws.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-dv.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-ts.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-05-21 16:22:54 UTC (rev 12310)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-05-21 18:15:20 UTC (rev 12311)
@@ -82,6 +82,7 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-impl.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-xjc.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jsr181-api.jar"
# Stack specific dependencies
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-cxf-client.jar"
@@ -111,7 +112,6 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-tools-wsdlto-frontend-jaxws.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-dv.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-ts.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-javaee.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/velocity.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-05-21 16:22:54 UTC (rev 12310)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-05-21 18:15:20 UTC (rev 12311)
@@ -40,6 +40,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar
rem stack specific libs
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-cxf-client.jar
@@ -71,7 +72,6 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/neethi.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-05-21 16:22:54 UTC (rev 12310)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-05-21 18:15:20 UTC (rev 12311)
@@ -82,6 +82,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-impl.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-xjc.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar"
# stack specific dependencies
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-cxf-client.jar"
@@ -113,7 +114,6 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-lang.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-logging.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/FastInfoset.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-javaee.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/neethi.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-05-21 16:22:54 UTC (rev 12310)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-05-21 18:15:20 UTC (rev 12311)
@@ -60,6 +60,7 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/xmlsec.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar
rem stack specific libs
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/asm.jar
@@ -92,7 +93,6 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/neethi.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-05-21 16:22:54 UTC (rev 12310)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-05-21 18:15:20 UTC (rev 12311)
@@ -80,6 +80,7 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/xmlsec.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jsr181-api.jar"
# stack specific dependencies
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/asm.jar"
@@ -112,7 +113,6 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/commons-lang.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/commons-logging.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/geronimo-ws-metadata_2.0_spec.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-javaee.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/neethi.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-05-21 16:22:54 UTC (rev 12310)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-21 18:15:20 UTC (rev 12311)
@@ -29,13 +29,12 @@
<include name="**/commons-collections.jar"/>
<include name="**/commons-lang.jar"/>
<include name="**/cxf-*.jar"/>
- <include name="**/geronimo-javamail*.jar"/>
- <include name="**/geronimo-ws-metadata*.jar"/>
<include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
<include name="**/jaxb-xjc.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
+ <include name="**/jsr181-api.jar"/>
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-cxf-client*.jar"/>
<include name="**/jbossws-framework.jar"/>
@@ -57,6 +56,7 @@
<include name="**/wstx.jar"/>
<include name="**/XmlSchema.jar"/>
<include name="**/FastInfoset.jar"/>
+ <include name="**/wstx.jar"/>
</patternset>
<patternset id="jbossws.lib.patternset">
@@ -75,11 +75,9 @@
<include name="**/commons-beanutils.jar"/>
<include name="**/cxf-*.jar"/>
<include name="**/FastInfoset.jar"/>
- <include name="**/geronimo-javamail*.jar"/>
- <include name="**/geronimo-ws-metadata*.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
- <include name="**/geronimo-ws-metadata*.jar"/>
+ <include name="**/jsr181-api.jar"/>
<include name="**/jboss-jaxb-intros.jar"/>
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-05-21 16:22:54 UTC (rev 12310)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-05-21 18:15:20 UTC (rev 12311)
@@ -141,8 +141,8 @@
<artifactId>jaxrpc-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
@@ -165,6 +165,10 @@
<artifactId>spring-tx</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </dependency>
<!-- jboss provided -->
<dependency>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-05-21 16:22:54 UTC (rev 12310)
+++ stack/cxf/trunk/pom.xml 2010-05-21 18:15:20 UTC (rev 12311)
@@ -68,6 +68,7 @@
<jaxrpc.api.version>1.1</jaxrpc.api.version>
<jaxws.api.version>2.1-1</jaxws.api.version>
<jboss.jaxr.version>2.0.1</jboss.jaxr.version>
+ <jsr181.api.version>1.0-MR1</jsr181.api.version>
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
<commons-collections.version>3.1</commons-collections.version>
@@ -171,12 +172,6 @@
<version>3.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- <scope>provided</scope>
- </dependency>
<!-- CXF dependencies -->
<dependency>
@@ -188,11 +183,31 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-http</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -203,16 +218,67 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-coloc</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-corba</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ <!-- Specify the Spring bits we need at the version we need later -->
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -239,6 +305,16 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -249,21 +325,53 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-java2ws</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-core</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -337,8 +445,8 @@
<version>${commons-lang.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
<version>${cxf.stax.version}</version>
</dependency>
<dependency>
@@ -356,18 +464,21 @@
<artifactId>asm</artifactId>
<version>${cxf.asm.version}</version>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${jsr181.api.version}</version>
+ </dependency>
<!-- jboss provided -->
<dependency>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-21 16:22:54 UTC (rev 12310)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-21 18:15:20 UTC (rev 12311)
@@ -24,8 +24,6 @@
<includes>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.xjcplugins:cxf-*</include>
- <include>org.apache.geronimo.specs:geronimo-javamail*</include>
- <include>org.apache.geronimo.specs:geronimo-ws-metadata*</include>
<include>javax.xml.bind:jaxb-api:jar</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
<include>com.sun.xml.bind:jaxb-xjc:jar</include>
@@ -53,23 +51,12 @@
<include>commons-lang:commons-lang:jar</include>
<include>jboss.jaxbintros:jboss-jaxb-intros</include>
<include>org.mortbay.jetty:jetty*</include>
+ <include>stax:stax-api:jar</include>
+ <include>javax.xml.ws:jaxws-api:jar</include>
+ <include>javax.jws:jsr181-api:jar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.apache.geronimo.specs:geronimo-jaxws_2.1_spec:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>stax-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
- </includes>
- </dependencySet>
- <dependencySet>
<outputFileNameMapping>wstx.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
13 years, 12 months
JBossWS SVN: r12310 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-21 12:22:54 -0400 (Fri, 21 May 2010)
New Revision: 12310
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java
Log:
[JBWS-2633] Enabling passing test
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java 2010-05-21 15:54:53 UTC (rev 12309)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java 2010-05-21 16:22:54 UTC (rev 12310)
@@ -41,12 +41,6 @@
public void testWSConsume() throws Exception
{
- if (true)
- {
- System.out.println("FIXME [JBWS-2633] wscompile fails to create valid package name where namespace contains capitalised reserved keyword.");
- return;
- }
-
// use absolute path for the output to be re-usable
String absOutput = "target/wsconsume/jbws2633";
String wsdlFile = createResourceFile("jaxws/jbws2633/PhoneBook.wsdl").getAbsolutePath();
13 years, 12 months
JBossWS SVN: r12309 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-21 11:54:53 -0400 (Fri, 21 May 2010)
New Revision: 12309
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
Updating stale excludes
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-05-21 15:50:42 UTC (rev 12308)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-05-21 15:54:53 UTC (rev 12309)
@@ -20,9 +20,6 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
-# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation
-org/jboss/test/ws/jaxws/cxf/jaxbintros/**
-
# [CXF-2819] <protocol-bindings>##SOAP12_Binding</protocol-bindings> in
# handler chain is not correctly matched
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-05-21 15:50:42 UTC (rev 12308)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-05-21 15:54:53 UTC (rev 12309)
@@ -20,9 +20,6 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
-# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation
-org/jboss/test/ws/jaxws/cxf/jaxbintros/**
-
# [CXF-2819] <protocol-bindings>##SOAP12_Binding</protocol-bindings> in
# handler chain is not correctly matched
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-05-21 15:50:42 UTC (rev 12308)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-05-21 15:54:53 UTC (rev 12309)
@@ -20,9 +20,6 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
-# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation
-org/jboss/test/ws/jaxws/cxf/jaxbintros/**
-
# [CXF-2819] <protocol-bindings>##SOAP12_Binding</protocol-bindings> in
# handler chain is not correctly matched
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
13 years, 12 months
JBossWS SVN: r12308 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-21 11:50:42 -0400 (Fri, 21 May 2010)
New Revision: 12308
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-3020] Update excludes description
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-05-21 14:51:48 UTC (rev 12307)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-05-21 15:50:42 UTC (rev 12308)
@@ -23,6 +23,10 @@
# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation
org/jboss/test/ws/jaxws/cxf/jaxbintros/**
+# [CXF-2819] <protocol-bindings>##SOAP12_Binding</protocol-bindings> in
+# handler chain is not correctly matched
+org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
@@ -57,9 +61,6 @@
org/jboss/test/ws/jaxws/jbws3027/**
org/jboss/test/ws/jaxws/jbws3031/**
-# [JBWS-3020] Investigate why HandlerScopeTestCase fails
-org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
-
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-05-21 14:51:48 UTC (rev 12307)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-05-21 15:50:42 UTC (rev 12308)
@@ -23,6 +23,10 @@
# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation
org/jboss/test/ws/jaxws/cxf/jaxbintros/**
+# [CXF-2819] <protocol-bindings>##SOAP12_Binding</protocol-bindings> in
+# handler chain is not correctly matched
+org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
@@ -57,9 +61,6 @@
org/jboss/test/ws/jaxws/jbws3027/**
org/jboss/test/ws/jaxws/jbws3031/**
-# [JBWS-3020] Investigate why HandlerScopeTestCase fails
-org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
-
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-05-21 14:51:48 UTC (rev 12307)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-05-21 15:50:42 UTC (rev 12308)
@@ -23,6 +23,10 @@
# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation
org/jboss/test/ws/jaxws/cxf/jaxbintros/**
+# [CXF-2819] <protocol-bindings>##SOAP12_Binding</protocol-bindings> in
+# handler chain is not correctly matched
+org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
@@ -51,9 +55,6 @@
org/jboss/test/ws/jaxws/jbws3031/**
org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*
-# [JBWS-3020] Investigate why HandlerScopeTestCase fails
-org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
-
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-05-21 14:51:48 UTC (rev 12307)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-05-21 15:50:42 UTC (rev 12308)
@@ -20,6 +20,10 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
+# [CXF-2819] <protocol-bindings>##SOAP12_Binding</protocol-bindings> in
+# handler chain is not correctly matched
+org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
@@ -48,9 +52,6 @@
org/jboss/test/ws/jaxws/jbws3031/**
org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*
-# [JBWS-3020] Investigate why HandlerScopeTestCase fails
-org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
-
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
13 years, 12 months
JBossWS SVN: r12307 - in stack/native/tags/jbossws-native-3.1.2.SP6: modules/client and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-21 10:51:48 -0400 (Fri, 21 May 2010)
New Revision: 12307
Modified:
stack/native/tags/jbossws-native-3.1.2.SP6/modules/client/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxrpc/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxws-ext/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxws/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP6/modules/management/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP6/modules/resources/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP6/modules/saaj/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/framework-tests/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/native-tests/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/pom.xml
stack/native/tags/jbossws-native-3.1.2.SP6/pom.xml
Log:
[JBPAPP-3408] Fixing poms
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/client/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/client/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/client/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -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.SP6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -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.SP6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxrpc/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxrpc/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxrpc/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -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.SP6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxws/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxws/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxws/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -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.SP6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxws-ext/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxws-ext/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/jaxws-ext/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -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.SP6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/management/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/management/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/management/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -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.SP6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/resources/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/resources/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/resources/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -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.SP6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/saaj/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/saaj/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/saaj/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -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.SP6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/framework-tests/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/framework-tests/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -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.SP6</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/native-tests/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/native-tests/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -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.SP6</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -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.SP6</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/pom.xml 2010-05-21 14:21:31 UTC (rev 12306)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/pom.xml 2010-05-21 14:51:48 UTC (rev 12307)
@@ -17,7 +17,7 @@
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP6</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.SP5</jbossws.common.version>
+ <jbossws.framework.version>3.1.2.SP6</jbossws.framework.version>
+ <jbossws.spi.version>1.1.2.SP3</jbossws.spi.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
13 years, 12 months
JBossWS SVN: r12306 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-21 10:21:31 -0400 (Fri, 21 May 2010)
New Revision: 12306
Added:
stack/native/tags/jbossws-native-3.1.2.SP6/
Log:
[JBPAPP-3408] Tagging jbossws-native-3.1.2.SP6
Copied: stack/native/tags/jbossws-native-3.1.2.SP6 (from rev 12305, stack/native/branches/jbossws-native-3.1.2)
13 years, 12 months