JBossWS SVN: r12344 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-26 09:27:20 -0400 (Wed, 26 May 2010)
New Revision: 12344
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/NativeEndpointReference.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java
Log:
[JBWS-2914] wsdlLocation in EPR have to be namespace qualified
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/NativeEndpointReference.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/NativeEndpointReference.java 2010-05-26 13:24:44 UTC (rev 12343)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/NativeEndpointReference.java 2010-05-26 13:27:20 UTC (rev 12344)
@@ -65,9 +65,10 @@
{
protected static final String WSA_NS = "http://www.w3.org/2005/08/addressing";
private static final String WSAM_NS = "http://www.w3.org/2007/05/addressing/metadata";
+ private static final String WSDLI_NS = "http://www.w3.org/ns/wsdl-instance";
private static final QName SERVICE_QNAME = new QName(WSAM_NS, "ServiceName", "wsam");
private static final QName INTERFACE_QNAME = new QName(WSAM_NS, "InterfaceName", "wsam");
- private static final QName WSDL_LOCATION_QNAME = new QName("wsdlLocation");
+ private static final QName WSDL_LOCATION_QNAME = new QName(WSDLI_NS, "wsdlLocation", "wsdli");
private static final String ENDPOINT_ATTRIBUTE = "EndpointName";
private static final JAXBContext jc = getJaxbContext();
@@ -131,7 +132,11 @@
final String wsdlLocation = metadataAttributes.get(WSDL_LOCATION_QNAME);
if (wsdlLocation != null)
{
- this.setWsdlLocation(wsdlLocation);
+ int spaceIndex = wsdlLocation.indexOf(" ");
+ if (spaceIndex == -1)
+ throw new IllegalArgumentException("wsdlLocation have to specify both wsdl namespace and target wsdl location");
+
+ this.setWsdlLocation(wsdlLocation.substring(spaceIndex).trim());
}
}
List<Element> metadataElements = epr.metadata.getElements();
@@ -286,10 +291,6 @@
return;
this.wsdlLocation = wsdlLocation;
- if (this.metadata == null)
- this.metadata = new Elements();
-
- this.metadata.addAttribute(WSDL_LOCATION_QNAME, wsdlLocation);
}
@XmlTransient
@@ -341,6 +342,27 @@
if (this.endpointName != null && this.serviceNameElement != null)
{
this.serviceNameElement.setAttribute(ENDPOINT_ATTRIBUTE, this.toString(this.endpointName));
+
+ if (this.wsdlLocation != null)
+ {
+ if (this.metadata == null)
+ this.metadata = new Elements();
+
+ String wsdlNamespace = null;
+ if (this.endpointName != null)
+ {
+ wsdlNamespace = this.endpointName.getNamespaceURI();
+ }
+ else if (this.serviceName != null)
+ {
+ wsdlNamespace = this.serviceName.getNamespaceURI();
+ }
+
+ if (wsdlNamespace == null && this.wsdlLocation != null)
+ throw new IllegalStateException("Either serviceName or endpointName have to be specified when providing wsdlLocation");
+
+ this.metadata.addAttribute(WSDL_LOCATION_QNAME, wsdlNamespace + " " + this.wsdlLocation);
+ }
}
try
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java 2010-05-26 13:24:44 UTC (rev 12343)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.java 2010-05-26 13:27:20 UTC (rev 12344)
@@ -21,18 +21,13 @@
*/
package org.jboss.test.ws.jaxws.epr;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
-import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference;
import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.DOMWriter;
import org.jboss.wsf.test.JBossWSTest;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -63,7 +58,7 @@
" <ns1:param1 wsa:IsReferenceParameter='true' xmlns:ns1='http://helloservice.org/param1' xmlns:wsa='http://www.w3.org/2005/08/addressing'>Hello</ns1:param1>" +
" <ns2:param2 wsa:IsReferenceParameter='true' xmlns:ns2='http://helloservice.org/param2' xmlns:wsa='http://www.w3.org/2005/08/addressing'>World</ns2:param2>" +
" </ReferenceParameters>" +
- " <Metadata wsdlLocation='http://localhost:8080/hello?wsdl'>" +
+ " <Metadata wsdli:wsdlLocation='http://helloservice.org/wsdl http://localhost:8080/hello?wsdl' xmlns:wsdli='http://www.w3.org/ns/wsdl-instance'>" +
" <wsam:ServiceName EndpointName='myns:HelloPort' xmlns:myns='http://helloservice.org/wsdl' xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'>myns:HelloService</wsam:ServiceName>" +
" <wsam:InterfaceName xmlns:myns='http://helloservice.org/wsdl' xmlns:wsam='http://www.w3.org/2007/05/addressing/metadata'>myns:Hello</wsam:InterfaceName>" +
" </Metadata>" +
@@ -100,7 +95,8 @@
private static void assertMetaData(final Node root)
{
Element metadataElement = (Element)DOMUtils.getFirstChildElement(root, METADATA_QNAME, true);
- assertEquals("wsdlLocation mismatch", metadataElement.getAttribute("wsdlLocation"), WSDL_URL);
+ String wsdlLocationValue = metadataElement.getAttributeNodeNS("http://www.w3.org/ns/wsdl-instance", "wsdlLocation").getValue();
+ assertEquals("wsdlLocation mismatch", wsdlLocationValue, MY_NS + " " + WSDL_URL);
Element serviceNameElement = (Element)DOMUtils.getFirstChildElement(metadataElement, WSAM_SERVICE_QNAME);
assertNamespaces(serviceNameElement);
assertEquals("wrong text content in ServiceName element", "myns:HelloService", DOMUtils.getTextContent(serviceNameElement));
13 years, 11 months
JBossWS SVN: r12343 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-26 09:24:44 -0400 (Wed, 26 May 2010)
New Revision: 12343
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java
Log:
[JBWS-2914] wsdlLocation in EPR have to be namespace qualified
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java 2010-05-26 11:34:45 UTC (rev 12342)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java 2010-05-26 13:24:44 UTC (rev 12343)
@@ -119,7 +119,8 @@
private static void assertMetaData(final Node root)
{
Element metadataElement = (Element)DOMUtils.getFirstChildElement(root, METADATA_QNAME, true);
- assertEquals("wsdlLocation mismatch", metadataElement.getAttribute("wsdlLocation"), WSDL_URL);
+ String wsdlLocationValue = metadataElement.getAttributeNodeNS("http://www.w3.org/ns/wsdl-instance", "wsdlLocation").getValue();
+ assertEquals("wsdlLocation mismatch", wsdlLocationValue, MY_NS + " " + WSDL_URL);
Element serviceNameElement = (Element)DOMUtils.getFirstChildElement(metadataElement, WSAM_SERVICE_QNAME);
assertNamespaces(serviceNameElement);
assertEquals("wrong text content in ServiceName element", "myns:HelloService", DOMUtils.getTextContent(serviceNameElement));
13 years, 11 months
JBossWS SVN: r12342 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 07:34:45 -0400 (Wed, 26 May 2010)
New Revision: 12342
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
Log:
[JBWS-2844] Also remove lib/endorsed/jbossws-cxf-* by default installation
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 11:33:41 UTC (rev 12341)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 11:34:45 UTC (rev 12342)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi!
.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi!
.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-cxf-* lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
13 years, 11 months
JBossWS SVN: r12341 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 07:33:41 -0400 (Wed, 26 May 2010)
New Revision: 12341
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf
Log:
[JBWS-2844] Remove cxf stuff from lib/endorsed too
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 11:32:44 UTC (rev 12340)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 11:33:41 UTC (rev 12341)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi!
.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi!
.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-cxf-* lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
13 years, 11 months
JBossWS SVN: r12340 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 07:32:44 -0400 (Wed, 26 May 2010)
New Revision: 12340
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf
Log:
[JBWS-2844] remove cxf stuff from lib/endorsed too
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 11:32:04 UTC (rev 12339)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 11:32:44 UTC (rev 12340)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-cxf-* client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi!
.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-cxf-* client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi!
.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-cxf-* lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
13 years, 11 months
JBossWS SVN: r12339 - in stack/cxf/trunk: modules and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 07:32:04 -0400 (Wed, 26 May 2010)
New Revision: 12339
Added:
stack/cxf/trunk/modules/endorsed/
stack/cxf/trunk/modules/endorsed/pom.xml
stack/cxf/trunk/modules/endorsed/src/
stack/cxf/trunk/modules/endorsed/src/main/
stack/cxf/trunk/modules/endorsed/src/main/resources/
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
Removed:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
Modified:
stack/cxf/trunk/modules/client/pom.xml
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-2844] Adding endorse module for forcing cxf jaxws impl
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2010-05-26 11:09:14 UTC (rev 12338)
+++ stack/cxf/trunk/modules/client/pom.xml 2010-05-26 11:32:04 UTC (rev 12339)
@@ -24,6 +24,11 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${version}</version>
+ </dependency>
<!-- CXF dependencies -->
<dependency>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2010-05-26 11:09:14 UTC (rev 12338)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2010-05-26 11:32:04 UTC (rev 12339)
@@ -1,4 +0,0 @@
-com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
-com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin
-com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin
-com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-05-26 11:09:14 UTC (rev 12338)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-05-26 11:32:04 UTC (rev 12339)
@@ -1 +0,0 @@
-org.apache.cxf.jaxws.spi.ProviderImpl
Added: stack/cxf/trunk/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/trunk/modules/endorsed/pom.xml (rev 0)
+++ stack/cxf/trunk/modules/endorsed/pom.xml 2010-05-26 11:32:04 UTC (rev 12339)
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Endorsed JAX-WS factories</name>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+</project>
Property changes on: stack/cxf/trunk/modules/endorsed/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
===================================================================
--- stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin (rev 0)
+++ stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2010-05-26 11:32:04 UTC (rev 12339)
@@ -0,0 +1,4 @@
+com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
+com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin
+com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin
+com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin
Added: stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider
===================================================================
--- stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider (rev 0)
+++ stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2010-05-26 11:32:04 UTC (rev 12339)
@@ -0,0 +1 @@
+org.apache.cxf.jaxws.spi.ProviderImpl
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-26 11:09:14 UTC (rev 12338)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-26 11:32:04 UTC (rev 12339)
@@ -71,6 +71,7 @@
<include name="**/jaxb-api.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/stax-api.jar"/>
+ <include name="**/jbossws-cxf-factories.jar"/>
</patternset>
<patternset id="jbossws.server.lib.patternset">
@@ -105,6 +106,7 @@
<patternset id="jbossws.service.lib.patternset">
<include name="**/jbossws-cxf-client*.jar"/>
+ <include name="**/jbossws-cxf-factories.jar"/>
<include name="**/jbossws-cxf-server*.jar"/>
</patternset>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-05-26 11:09:14 UTC (rev 12338)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-05-26 11:32:04 UTC (rev 12339)
@@ -35,6 +35,11 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${version}</version>
+ </dependency>
<!-- CXF dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-05-26 11:09:14 UTC (rev 12338)
+++ stack/cxf/trunk/pom.xml 2010-05-26 11:32:04 UTC (rev 12339)
@@ -38,6 +38,7 @@
<modules>
<module>modules/server</module>
<module>modules/client</module>
+ <module>modules/endorsed</module>
<module>modules/management</module>
<module>modules/resources</module>
</modules>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-26 11:09:14 UTC (rev 12338)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-26 11:32:04 UTC (rev 12339)
@@ -22,6 +22,7 @@
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
+ <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.xjcplugins:cxf-*</include>
<include>javax.xml.bind:jaxb-api:jar</include>
13 years, 11 months
JBossWS SVN: r12338 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 07:09:14 -0400 (Wed, 26 May 2010)
New Revision: 12338
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
Log:
[JBWS-3030] Also remove jbossws-cxf-* from client
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 11:06:17 UTC (rev 12337)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 11:09:14 UTC (rev 12338)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/wscommons!
-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi!
.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
13 years, 11 months
JBossWS SVN: r12337 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 07:06:17 -0400 (Wed, 26 May 2010)
New Revision: 12337
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf
Log:
[JBWS-3030] Also remove jbossws-cxf-* from client
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 11:04:29 UTC (rev 12336)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 11:06:17 UTC (rev 12337)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/wscommons!
-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi!
.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
13 years, 11 months
JBossWS SVN: r12336 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 07:04:29 -0400 (Wed, 26 May 2010)
New Revision: 12336
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf
Log:
[JBWS-3030] Also remove jbossws-cxf-* from client
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 10:00:59 UTC (rev 12335)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-26 11:04:29 UTC (rev 12336)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/wscommons!
-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-cxf-* client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi!
.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
13 years, 11 months
JBossWS SVN: r12335 - in stack/native/tags/jbossws-native-3.1.2.SP6: modules/core/src/main/java/org/jboss/ws/core/jaxws/handler and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 06:00:59 -0400 (Wed, 26 May 2010)
New Revision: 12335
Modified:
stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
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-4384] Updating 3.1.2.SP6 tag as it's not been built yet
Modified: stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2010-05-26 09:51:37 UTC (rev 12334)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2010-05-26 10:00:59 UTC (rev 12335)
@@ -28,6 +28,7 @@
import java.util.Map;
import java.util.Set;
+import javax.naming.Context;
import javax.xml.namespace.QName;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.HandlerResolver;
@@ -46,6 +47,8 @@
import org.jboss.wsf.common.handler.GenericHandler;
import org.jboss.wsf.common.handler.GenericSOAPHandler;
import org.jboss.wsf.common.injection.InjectionHelper;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
@@ -168,7 +171,12 @@
if (handler instanceof GenericSOAPHandler)
((GenericSOAPHandler)handler).setHeaders(soapHeaders);
- InjectionHelper.injectResources(handler, injections);
+ if (injections != null)
+ {
+ Endpoint ep = EndpointAssociation.getEndpoint();
+ Context ctx = ep == null ? null : ep.getJNDIContext();
+ InjectionHelper.injectResources(handler, injections, ctx);
+ }
InjectionHelper.callPostConstructMethod(handler);
addHandler(jaxwsMetaData, handler, type);
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-26 09:51:37 UTC (rev 12334)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/modules/testsuite/pom.xml 2010-05-26 10:00:59 UTC (rev 12335)
@@ -17,7 +17,7 @@
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
- <surefire.gc.args>-XX:MaxPermSize=128m</surefire.gc.args>
+ <surefire.gc.args>-Xmx256m -XX:MaxPermSize=256m</surefire.gc.args>
<test.archive.directory>${project.build.directory}/test-libs</test.archive.directory>
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
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-26 09:51:37 UTC (rev 12334)
+++ stack/native/tags/jbossws-native-3.1.2.SP6/pom.xml 2010-05-26 10:00:59 UTC (rev 12335)
@@ -47,9 +47,9 @@
<!-- Properties -->
<properties>
- <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>
+ <jbossws.common.version>1.1.0.SP6</jbossws.common.version>
+ <jbossws.framework.version>3.1.2.SP7</jbossws.framework.version>
+ <jbossws.spi.version>1.1.2.SP4</jbossws.spi.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
13 years, 11 months