JBossWS SVN: r17198 - in shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test: java/org/jboss/test/ws/publish and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 09:22:10 -0500 (Tue, 08 Jan 2013)
New Revision: 17198
Added:
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl5.java
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl5.xml
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/TestService.xml
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-samples-jaxws.xml
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
Log:
[JBPAPP6-1676][JBPAPP6-1678] Adding testcase
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-samples-jaxws.xml
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-samples-jaxws.xml 2013-01-08 12:02:28 UTC (rev 17197)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-samples-jaxws.xml 2013-01-08 14:22:10 UTC (rev 17198)
@@ -512,17 +512,19 @@
</classes>
</war>
- <!-- endpoint-publish.war -->
+ <!-- endpoint-publish.war -->
<war warfile="${tests.output.dir}/test-libs/endpoint-publish.war" needxmlfile='false'>
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/publish/**/*.class"/>
+ <include name="org/jboss/test/ws/publish/EndpointImpl5.xml"/>
+ <include name="org/jboss/test/ws/publish/TestService.xml"/>
<exclude name="org/jboss/test/ws/publish/*TestCase.class"/>
</classes>
<classes dir="${tests.output.dir}/test-classes/org/jboss/test/ws/publish" erroronmissingdir="false">
<include name="WEB-INF/wsdl/**" />
</classes>
<webinf dir="${tests.output.dir}/test-resources/publish/WEB-INF" erroronmissingdir="false">
- <include name="wsdl/**"/>
+ <include name="wsdl/**"/>
</webinf>
</war>
Added: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl5.java
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl5.java (rev 0)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl5.java 2013-01-08 14:22:10 UTC (rev 17198)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.publish;
+
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.Provider;
+import javax.xml.ws.Service;
+import javax.xml.ws.ServiceMode;
+import javax.xml.ws.WebServiceProvider;
+
+import org.jboss.logging.Logger;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+@WebServiceProvider
+@ServiceMode(value = Service.Mode.MESSAGE)
+public class EndpointImpl5 implements Provider<SOAPMessage>
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(EndpointImpl5.class);
+
+ public SOAPMessage invoke(SOAPMessage request)
+ {
+ log.info("echo (5): " + request);
+ try {
+ SOAPBody sb = request.getSOAPBody();
+ NodeList nl = sb.getElementsByTagName("arg0");
+ if (nl.getLength() != 1) {
+ throw new IllegalArgumentException("Unexpected input!");
+ }
+ Node ret = sb.getOwnerDocument().createElement("return");
+ Node arg0 = nl.item(0);
+ ret.appendChild(arg0.getFirstChild().cloneNode(true));
+ Node parent = arg0.getParentNode();
+ parent.removeChild(arg0);
+ parent.appendChild(ret);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return request;
+ }
+}
Added: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl5.xml
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl5.xml (rev 0)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl5.xml 2013-01-08 14:22:10 UTC (rev 17198)
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+ <wsdl:definitions name="EndpointService5"
+ targetNamespace="http://publish.ws.test.jboss.org/"
+ xmlns:ns1="http://schemas.xmlsoap.org/soap/http"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://publish.ws.test.jboss.org/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+ <xsd:schema>
+ <xsd:import namespace="http://publish.ws.test.jboss.org/" schemaLocation="TestService.xml" />
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="echoStringResponse">
+ <wsdl:part name="return" type="xsd:string">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoString">
+ <wsdl:part name="arg0" type="xsd:string">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="Endpoint">
+ <wsdl:operation name="echoString">
+ <wsdl:input message="tns:echoString" name="echoString">
+ </wsdl:input>
+ <wsdl:output message="tns:echoStringResponse" name="echoStringResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="EndpointService5SoapBinding" type="tns:Endpoint">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="echoString">
+ <soap:operation soapAction="urn:EchoString" style="rpc"/>
+ <wsdl:input name="echoString">
+ <soap:body namespace="http://publish.ws.test.jboss.org/" use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="echoStringResponse">
+ <soap:body namespace="http://publish.ws.test.jboss.org/" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="EndpointService5">
+ <wsdl:port binding="tns:EndpointService5SoapBinding" name="EndpointPort5">
+ <soap:address location="http://localhost:8080/ep-publish-test/pattern5"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2013-01-08 12:02:28 UTC (rev 17197)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2013-01-08 14:22:10 UTC (rev 17198)
@@ -78,6 +78,7 @@
map.put("/pattern2", "org.jboss.test.ws.publish.EndpointImpl2");
map.put("/pattern3", "org.jboss.test.ws.publish.EndpointImpl3");
map.put("/pattern4", "org.jboss.test.ws.publish.EndpointImpl4");
+ map.put("/pattern5", "org.jboss.test.ws.publish.EndpointImpl5");
ctx = publisher.publish("ep-publish-test", Thread.currentThread().getContextClassLoader(), map, createMetaData());
@@ -97,6 +98,7 @@
invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern2?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService2"));
invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern3?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService3"));
invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern4?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService4"));
+ invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern5?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService5"));
res.getWriter().print("1");
}
@@ -122,7 +124,7 @@
}
}
}
-
+
private WebservicesMetaData createMetaData() {
WebservicesMetaData metadata = new WebservicesMetaData();
WebserviceDescriptionMetaData webserviceDescription = new WebserviceDescriptionMetaData(metadata);
@@ -133,7 +135,22 @@
portComponent.setServiceEndpointInterface("org.jboss.test.ws.publish.EndpointImpl4");
portComponent.setWsdlPort(new QName("http://publish.ws.test.jboss.org/", "EndpointPort4"));
portComponent.setWsdlService(new QName("http://publish.ws.test.jboss.org/", "EndpointService4"));
+ // mandatory servlet link (because endpoint is POJO) - needed for proper matching of endpoint with WebservicesMD
+ portComponent.setServletLink("org.jboss.test.ws.publish.EndpointImpl4");
+ // if endpoint ^ would be EJB, users have to use setEjbLink() method instead
webserviceDescription.addPortComponent(portComponent);
+ WebserviceDescriptionMetaData webserviceDescription2 = new WebserviceDescriptionMetaData(metadata);
+ metadata.addWebserviceDescription(webserviceDescription2);
+ webserviceDescription2.setWsdlFile("org/jboss/test/ws/publish/EndpointImpl5.xml"); //test JBWS-3540
+ PortComponentMetaData portComponent2 = new PortComponentMetaData(webserviceDescription2);
+ portComponent2.setPortComponentName("PortComponent5"); //unique ID
+ portComponent2.setServiceEndpointInterface("org.jboss.test.ws.publish.EndpointImpl5");
+ portComponent2.setWsdlPort(new QName("http://publish.ws.test.jboss.org/", "EndpointPort5"));
+ portComponent2.setWsdlService(new QName("http://publish.ws.test.jboss.org/", "EndpointService5"));
+ // mandatory servlet link (because endpoint is POJO) - needed for proper matching of endpoint with WebservicesMD
+ portComponent2.setServletLink("org.jboss.test.ws.publish.EndpointImpl5");
+ // if endpoint ^ would be EJB, users have to use setEjbLink() method instead
+ webserviceDescription2.addPortComponent(portComponent2);
return metadata;
}
Added: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/TestService.xml
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/TestService.xml (rev 0)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/publish/TestService.xml 2013-01-08 14:22:10 UTC (rev 17198)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema version="1.0" xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified" attributeFormDefault="unqualified"
+ targetNamespace="http://publish.ws.test.jboss.org/"
+ xmlns:tns="http://publish.ws.test.jboss.org/">
+
+ <element name='foo' type='tns:foo'/>
+</schema>
\ No newline at end of file
11 years, 12 months
JBossWS SVN: r17197 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 07:02:28 -0500 (Tue, 08 Jan 2013)
New Revision: 17197
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java
Log:
[JBPAPP6-1767] EndpointPublisher: xsd imports cause deployment error unless placed in WEB-INF dir
Merged revisions 16646 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16646 | alessio.soldano(a)jboss.com | 2012-08-27 18:55:00 +0200 (Mon, 27 Aug 2012) | 2 lines
[JBWS-3540] Derive expected schema location from path in wsdlLocation
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996-16997,17042,17061,17067,17130,17138-17141,17171
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16646,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996-16997,17042,17061,17067,17130,17138-17141,17171
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2013-01-08 12:01:16 UTC (rev 17196)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2013-01-08 12:02:28 UTC (rev 17197)
@@ -216,8 +216,12 @@
Service service = endpoint.getService();
try
{
- JaxWsImplementorInfo info = new JaxWsImplementorInfo(getImplementorClass());
- wsdlPublisher.publishWsdlFiles(service.getName(), info.getWsdlLocation(), BusFactory.getThreadDefaultBus(false), service.getServiceInfos());
+ String wsdlLocation = getWsdlLocation();
+ if (wsdlLocation == null) {
+ JaxWsImplementorInfo info = new JaxWsImplementorInfo(getImplementorClass());
+ wsdlLocation = info.getWsdlLocation();
+ }
+ wsdlPublisher.publishWsdlFiles(service.getName(), wsdlLocation, BusFactory.getThreadDefaultBus(false), service.getServiceInfos());
}
catch (IOException ioe)
{
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2013-01-08 12:01:16 UTC (rev 17196)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/WSDLFilePublisher.java 2013-01-08 12:02:28 UTC (rev 17197)
@@ -89,10 +89,11 @@
if (def != null)
{
List<String> published = new LinkedList<String>();
- publishWsdlImports(wsdlPublishURL, def, published);
+ String expLocation = getExpLocation(wsdlLocation);
+ publishWsdlImports(wsdlPublishURL, def, published, expLocation);
// Publish XMLSchema imports
- publishSchemaImports(wsdlPublishURL, doc.getDocumentElement(), published);
+ publishSchemaImports(wsdlPublishURL, doc.getDocumentElement(), published, expLocation);
}
else
{
@@ -181,4 +182,12 @@
return result;
}
+
+ private String getExpLocation(String wsdlLocation) {
+ if (wsdlLocation == null || wsdlLocation.indexOf(expLocation) >= 0) {
+ return expLocation;
+ } else { //JBWS-3540
+ return wsdlLocation.contains("/") ? wsdlLocation.substring(0, wsdlLocation.lastIndexOf("/") + 1) : "";
+ }
+ }
}
11 years, 12 months
JBossWS SVN: r17196 - common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/utils.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 07:01:16 -0500 (Tue, 08 Jan 2013)
New Revision: 17196
Modified:
common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
Log:
[JBPAPP6-1767] Allow passing in explicit expected location for schemas
Modified: common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
===================================================================
--- common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2013-01-08 11:52:11 UTC (rev 17195)
+++ common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2013-01-08 12:01:16 UTC (rev 17196)
@@ -125,10 +125,15 @@
return builder;
}
+ protected void publishWsdlImports(URL parentURL, Definition parentDefinition, List<String> published) throws Exception
+ {
+ this.publishWsdlImports(parentURL, parentDefinition, published, expLocation);
+ }
+
/** Publish the wsdl imports for a given wsdl definition
*/
@SuppressWarnings("unchecked")
- protected void publishWsdlImports(URL parentURL, Definition parentDefinition, List<String> published) throws Exception
+ protected void publishWsdlImports(URL parentURL, Definition parentDefinition, List<String> published, String expLocation) throws Exception
{
String baseURI = parentURL.toExternalForm();
@@ -166,19 +171,24 @@
log.debug("WSDL import published to: " + targetURL);
// recursively publish imports
- publishWsdlImports(targetURL, subdef, published);
+ publishWsdlImports(targetURL, subdef, published, expLocation);
// Publish XMLSchema imports
Element subdoc = DOMUtils.parse(targetURL.openStream(), getDocumentBuilder());
- publishSchemaImports(targetURL, subdoc, published);
+ publishSchemaImports(targetURL, subdoc, published, expLocation);
}
}
}
}
+
+ protected void publishSchemaImports(URL parentURL, Element element, List<String> published) throws Exception
+ {
+ this.publishSchemaImports(parentURL, element, published, expLocation);
+ }
/** Publish the schema imports for a given wsdl definition
*/
- protected void publishSchemaImports(URL parentURL, Element element, List<String> published) throws Exception
+ protected void publishSchemaImports(URL parentURL, Element element, List<String> published, String expLocation) throws Exception
{
String baseURI = parentURL.toExternalForm();
@@ -240,13 +250,13 @@
// recursively publish imports
Element subdoc = DOMUtils.parse(xsdURL.openStream(), getDocumentBuilder());
- publishSchemaImports(xsdURL, subdoc, published);
+ publishSchemaImports(xsdURL, subdoc, published, expLocation);
}
}
}
else
{
- publishSchemaImports(parentURL, childElement, published);
+ publishSchemaImports(parentURL, childElement, published, expLocation);
}
}
}
11 years, 12 months
JBossWS SVN: r17195 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 06:52:11 -0500 (Tue, 08 Jan 2013)
New Revision: 17195
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Unblocked revisions 16646 via svnmerge
.......
r16646 | alessio.soldano(a)jboss.com | 2012-08-27 18:55:00 +0200 (Mon, 27 Aug 2012) | 2 lines
[JBWS-3540] Derive expected schema location from path in wsdlLocation
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...!
043,17051-17052,17057,17059-17060,17070,17073,17135-17136,17142,17170,17180,17187
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...!
051-17052,17057,17059-17060,17070,17073,17135-17136,17142,17170,17180,17187
11 years, 12 months
JBossWS SVN: r17194 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 06:50:09 -0500 (Tue, 08 Jan 2013)
New Revision: 17194
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
Use jbossws-common snapshot
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2013-01-08 11:17:45 UTC (rev 17193)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2013-01-08 11:50:09 UTC (rev 17194)
@@ -61,7 +61,7 @@
<properties>
<jbossws.api.version>1.0.0.GA</jbossws.api.version>
<jbossws.spi.version>2.0.4.GA</jbossws.spi.version>
- <jbossws.common.version>2.0.4.GA</jbossws.common.version>
+ <jbossws.common.version>2.0.5-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.2.GA</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.8-SNAPSHOT</jbossws.shared.testsuite.version>
<jboss712.version>7.1.3.Final-SNAPSHOT</jboss712.version>
11 years, 12 months
JBossWS SVN: r17193 - stack/native/branches/jbossws-native-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 06:17:45 -0500 (Tue, 08 Jan 2013)
New Revision: 17193
Modified:
stack/native/branches/jbossws-native-4.0.x/
Log:
Blocked revisions 16871,16898,16900,16911,16937,17007,17019,17021,17068,17074,17117 via svnmerge
.......
r16871 | alessio.soldano(a)jboss.com | 2012-10-12 15:50:02 +0200 (Fri, 12 Oct 2012) | 3 lines
[JBWS-3509] Rely on local bundle utils for the Native SAAJ impl; will not port this to new logging (we ofcourse don't port to our jboss logging the SAAJ RI that used for anything except internal JAXRPC impl, porting the Native SAAJ impl is not worth the effort; in any case the message are already included in text bundles that can be internationalised)
.......
r16898 | alessio.soldano(a)jboss.com | 2012-10-15 16:23:27 +0200 (Mon, 15 Oct 2012) | 2 lines
[JBWS-3558] Preparing for tagging
.......
r16900 | alessio.soldano(a)jboss.com | 2012-10-15 17:19:46 +0200 (Mon, 15 Oct 2012) | 2 lines
Preparing for next dev cycle
.......
r16911 | richard.opalka(a)jboss.com | 2012-10-16 09:38:13 +0200 (Tue, 16 Oct 2012) | 1 line
don't use SNAPSHOTs - until there are changes that need to be incorporated
.......
r16937 | richard.opalka(a)jboss.com | 2012-10-22 16:06:11 +0200 (Mon, 22 Oct 2012) | 1 line
removing AS 712 support, adding AS 713 support
.......
r17007 | richard.opalka(a)jboss.com | 2012-11-16 15:08:31 +0100 (Fri, 16 Nov 2012) | 1 line
[JBWS-3565] WS ref optimization
.......
r17019 | richard.opalka(a)jboss.com | 2012-11-16 16:25:12 +0100 (Fri, 16 Nov 2012) | 1 line
prepare for tagging
.......
r17021 | richard.opalka(a)jboss.com | 2012-11-16 16:27:50 +0100 (Fri, 16 Nov 2012) | 1 line
prepare for next dev. cycle
.......
r17068 | alessio.soldano(a)jboss.com | 2012-12-11 19:24:53 +0100 (Tue, 11 Dec 2012) | 2 lines
Minor fix
.......
r17074 | alessio.soldano(a)jboss.com | 2012-12-13 20:12:57 +0100 (Thu, 13 Dec 2012) | 2 lines
[JBWS-3577] Native RequestHandler as singleton
.......
r17117 | alessio.soldano(a)jboss.com | 2012-12-18 09:02:37 +0100 (Tue, 18 Dec 2012) | 2 lines
Removing wrong svn:mime-type props
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,...
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,...
11 years, 12 months
JBossWS SVN: r17192 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 05:28:10 -0500 (Tue, 08 Jan 2013)
New Revision: 17192
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Blocked revisions 16873-16874,16879,16883,16901,16903,16912,16916-16917,16919-16920,16924,16929-16931,16938,16942,16947-16950,16952,16981,17009-17010,17022,17024-17025,17038,17041,17043,17051-17052,17057,17059-17060,17070,17073,17135-17136,17142,17170,17180,17187 via svnmerge
.......
r16873 | alessio.soldano(a)jboss.com | 2012-10-12 16:07:42 +0200 (Fri, 12 Oct 2012) | 2 lines
[JBWS-3509] Removing old import
.......
r16874 | alessio.soldano(a)jboss.com | 2012-10-15 10:51:56 +0200 (Mon, 15 Oct 2012) | 2 lines
Updating documentation
.......
r16879 | richard.opalka(a)jboss.com | 2012-10-15 11:34:49 +0200 (Mon, 15 Oct 2012) | 1 line
prepare Release Notes before tagging
.......
r16883 | richard.opalka(a)jboss.com | 2012-10-15 11:45:15 +0200 (Mon, 15 Oct 2012) | 1 line
updating release notes
.......
r16901 | alessio.soldano(a)jboss.com | 2012-10-15 18:00:25 +0200 (Mon, 15 Oct 2012) | 2 lines
[JBWS-3558] Preparing for tagging
.......
r16903 | alessio.soldano(a)jboss.com | 2012-10-15 18:19:03 +0200 (Mon, 15 Oct 2012) | 2 lines
Moving to next dev cycle
.......
r16912 | richard.opalka(a)jboss.com | 2012-10-16 09:39:17 +0200 (Tue, 16 Oct 2012) | 1 line
don't use SNAPSHOTs - until there are changes that need to be incorporated
.......
r16916 | richard.opalka(a)jboss.com | 2012-10-16 12:41:53 +0200 (Tue, 16 Oct 2012) | 1 line
switch to Apache CXF 2.7.1-SNAPSHOT
.......
r16917 | alessio.soldano(a)jboss.com | 2012-10-16 20:37:47 +0200 (Tue, 16 Oct 2012) | 2 lines
Adding testcase on ignoring endpoint contract policies scenario (use of CXF IgnorablePolicyInterceptorProvider)
.......
r16919 | alessio.soldano(a)jboss.com | 2012-10-18 18:42:45 +0200 (Thu, 18 Oct 2012) | 2 lines
[AS7-5784] Excluding test
.......
r16920 | alessio.soldano(a)jboss.com | 2012-10-18 18:43:04 +0200 (Thu, 18 Oct 2012) | 2 lines
Moving to shared testsuite snapshot
.......
r16924 | richard.opalka(a)jboss.com | 2012-10-19 10:28:13 +0200 (Fri, 19 Oct 2012) | 1 line
[JBWS-3552] excluding test for now - until fixes are available in Apache CXF
.......
r16929 | alessio.soldano(a)jboss.com | 2012-10-19 12:09:18 +0200 (Fri, 19 Oct 2012) | 2 lines
Moving to latest snapshots of ASIL
.......
r16930 | alessio.soldano(a)jboss.com | 2012-10-19 12:12:39 +0200 (Fri, 19 Oct 2012) | 2 lines
[AS7-5784] Enabling tests on 71x
.......
r16931 | alessio.soldano(a)jboss.com | 2012-10-19 12:14:41 +0200 (Fri, 19 Oct 2012) | 2 lines
[AS7-5784] Also enabling on 720
.......
r16938 | richard.opalka(a)jboss.com | 2012-10-22 16:08:18 +0200 (Mon, 22 Oct 2012) | 1 line
removing AS 710 support, adding AS 713 support
.......
r16942 | richard.opalka(a)jboss.com | 2012-10-23 15:51:08 +0200 (Tue, 23 Oct 2012) | 1 line
[JBWS-3441] enabling test case
.......
r16947 | richard.opalka(a)jboss.com | 2012-10-24 19:13:44 +0200 (Wed, 24 Oct 2012) | 1 line
[JBWS-3552][CXF-4591] enabling test case
.......
r16948 | alessio.soldano(a)jboss.com | 2012-10-25 16:42:43 +0200 (Thu, 25 Oct 2012) | 2 lines
[JBWS-3561] Moving cxf management conf option to jboss-webservices.xml and updating testcase
.......
r16949 | alessio.soldano(a)jboss.com | 2012-10-25 16:43:24 +0200 (Thu, 25 Oct 2012) | 2 lines
[JBWS-3561] Adding constants, forgotten in previous commit
.......
r16950 | alessio.soldano(a)jboss.com | 2012-10-25 17:26:22 +0200 (Thu, 25 Oct 2012) | 2 lines
[JBWS-3561] Removing constant not used anymore
.......
r16952 | richard.opalka(a)jboss.com | 2012-10-29 11:46:39 +0100 (Mon, 29 Oct 2012) | 1 line
[AS7-5848] fix JAXWS wrappers issue - ASM have to be on CXF API classpath
.......
r16981 | alessio.soldano(a)jboss.com | 2012-11-14 11:20:57 +0100 (Wed, 14 Nov 2012) | 2 lines
Adding sample with ejb3 endpoint using @EndpointConfig and referencing wss4j props file to show how to package prop files
.......
r17009 | richard.opalka(a)jboss.com | 2012-11-16 15:11:55 +0100 (Fri, 16 Nov 2012) | 1 line
[JBWS-3565] WS ref optimization
.......
r17010 | richard.opalka(a)jboss.com | 2012-11-16 15:12:30 +0100 (Fri, 16 Nov 2012) | 1 line
switch to CXF 2.6.3 for a while
.......
r17022 | richard.opalka(a)jboss.com | 2012-11-16 16:40:48 +0100 (Fri, 16 Nov 2012) | 1 line
prepare for tagging
.......
r17024 | richard.opalka(a)jboss.com | 2012-11-16 16:43:37 +0100 (Fri, 16 Nov 2012) | 1 line
prepare for next dev. cycle
.......
r17025 | richard.opalka(a)jboss.com | 2012-11-16 16:44:11 +0100 (Fri, 16 Nov 2012) | 1 line
switch back to Apache CXF 2.7.1-SNAPSHOT
.......
r17038 | alessio.soldano(a)jboss.com | 2012-11-26 11:01:23 +0100 (Mon, 26 Nov 2012) | 2 lines
[JBWS-3567] Moving to wss4j 1.6.8-SNAPSHOT
.......
r17041 | richard.opalka(a)jboss.com | 2012-11-27 10:31:16 +0100 (Tue, 27 Nov 2012) | 1 line
[CXF-4653] excluding test for a while until fix is available in upstream
.......
r17043 | richard.opalka(a)jboss.com | 2012-11-27 14:04:12 +0100 (Tue, 27 Nov 2012) | 1 line
enabling tests again
.......
r17051 | alessio.soldano(a)jboss.com | 2012-12-05 15:45:10 +0100 (Wed, 05 Dec 2012) | 2 lines
[JBWS-3570] Replacing SoapTransportFactoryExt/AddressRewritingEndpointInfo integration hack with usage of Apache CXF 'publishedEndpointUrl' endpoint configuration option + fixing a couple of related bugs. This requires changes in JBWS-3571 and CXF-4674.
.......
r17052 | alessio.soldano(a)jboss.com | 2012-12-05 15:46:09 +0100 (Wed, 05 Dec 2012) | 2 lines
[JBWS-3570] Fixing testcase regression
.......
r17057 | alessio.soldano(a)jboss.com | 2012-12-06 18:48:23 +0100 (Thu, 06 Dec 2012) | 2 lines
[JBWS-3570] Fixing regression
.......
r17059 | richard.opalka(a)jboss.com | 2012-12-09 19:13:02 +0100 (Sun, 09 Dec 2012) | 1 line
upgrade to latest CXF snapshot
.......
r17060 | richard.opalka(a)jboss.com | 2012-12-10 10:03:28 +0100 (Mon, 10 Dec 2012) | 1 line
[JBWS-3572] upgrade Apache CXF from 2.6.3 -> 2.6.4
.......
r17070 | alessio.soldano(a)jboss.com | 2012-12-13 16:14:27 +0100 (Thu, 13 Dec 2012) | 2 lines
[JBWS-3576] Get ServerConfig from AbstractServerConfig static convenient method whenever it makes sense
.......
r17073 | alessio.soldano(a)jboss.com | 2012-12-13 20:12:34 +0100 (Thu, 13 Dec 2012) | 2 lines
[JBWS-3577] CXF RequestHandler as singleton
.......
r17135 | alessio.soldano(a)jboss.com | 2012-12-19 09:08:14 +0100 (Wed, 19 Dec 2012) | 2 lines
[JBWS-3551] Impl and use failsafe methods
.......
r17136 | alessio.soldano(a)jboss.com | 2012-12-19 11:06:05 +0100 (Wed, 19 Dec 2012) | 2 lines
[JBWS-3573] More misc minor fixes..
.......
r17142 | richard.opalka(a)jboss.com | 2012-12-19 15:38:51 +0100 (Wed, 19 Dec 2012) | 1 line
minimize synchronized section code
.......
r17170 | alessio.soldano(a)jboss.com | 2012-12-21 09:55:05 +0100 (Fri, 21 Dec 2012) | 2 lines
Updating release notes
.......
r17180 | alessio.soldano(a)jboss.com | 2012-12-21 11:57:34 +0100 (Fri, 21 Dec 2012) | 2 lines
Updating documentation
.......
r17187 | alessio.soldano(a)jboss.com | 2013-01-08 08:48:00 +0100 (Tue, 08 Jan 2013) | 2 lines
Move to Apache CXF 2.6.5
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...!
043,17051-17052,17057,17059-17060,17070,17073,17135-17136,17142,17170,17180,17187
11 years, 12 months
JBossWS SVN: r17191 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 05:14:39 -0500 (Tue, 08 Jan 2013)
New Revision: 17191
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java
Log:
Merged revisions 17130,17138,17141,17171 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r17130 | richard.opalka(a)jboss.com | 2012-12-19 08:39:39 +0100 (Wed, 19 Dec 2012) | 1 line
fixing synchronization issues
.......
r17138 | alessio.soldano(a)jboss.com | 2012-12-19 11:37:43 +0100 (Wed, 19 Dec 2012) | 2 lines
[JBWS-3573] Create DelegateClassloader in a doPrivileged action
.......
r17141 | richard.opalka(a)jboss.com | 2012-12-19 15:07:26 +0100 (Wed, 19 Dec 2012) | 1 line
fixing synchronization issues
.......
r17171 | alessio.soldano(a)jboss.com | 2012-12-21 10:33:42 +0100 (Fri, 21 Dec 2012) | 2 lines
Get rid of old ASIL jars too
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996-16997,17042,17061,17067
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996-16997,17042,17061,17067,17130,17138-17141,17171
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java 2013-01-08 09:59:06 UTC (rev 17190)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java 2013-01-08 10:14:39 UTC (rev 17191)
@@ -62,23 +62,23 @@
this.host = host;
this.port = port;
}
-
- public Bus getBus()
+
+ public synchronized Bus getBus()
{
return bus;
}
- public String getProtocol()
+ public synchronized String getProtocol()
{
return protocol;
}
- public int getPort()
+ public synchronized int getPort()
{
return port;
}
- public String getHost()
+ public synchronized String getHost()
{
return host;
}
@@ -112,7 +112,7 @@
/**
* This method is called by the ServerEngine Factory to destroy the server
*/
- protected void stop() throws Exception
+ protected synchronized void stop() throws Exception
{
if (server != null)
{
@@ -124,7 +124,7 @@
* This method will shut down the server engine and
* remove it from the factory's cache.
*/
- public void shutdown()
+ public synchronized void shutdown()
{
if (factory != null && handlerCount == 0)
{
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2013-01-08 09:59:06 UTC (rev 17190)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2013-01-08 10:14:39 UTC (rev 17191)
@@ -44,7 +44,7 @@
*/
public class HttpServerEngineFactory implements BusLifeCycleListener
{
- private static final Logger LOG = LogUtils.getL7dLogger(HttpServerEngineFactory.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(HttpServerEngineFactory.class);
private static Map<Integer, HttpServerEngine> portMap = new HashMap<Integer, HttpServerEngine>();
private BusLifeCycleManager lifeCycleManager;
@@ -79,7 +79,7 @@
{
return bus;
}
-
+
/**
* Retrieve a previously configured HttpServerEngine for the
* given port. If none exists, this call returns null.
@@ -116,7 +116,7 @@
}
return ref;
}
-
+
/**
* This method removes the Server Engine from the port map and stops it.
*/
@@ -145,12 +145,15 @@
// do nothing here
}
- public void postShutdown()
+ public synchronized void postShutdown()
{
// shut down the httpserver in the portMap
- // To avoid the CurrentModificationException,
- // do not use portMap.vaules directly
- HttpServerEngine[] engines = portMap.values().toArray(new HttpServerEngine[0]);
+ // To avoid the CurrentModificationException,
+ // do not use portMap.vaules directly
+ HttpServerEngine[] engines = null;
+ synchronized (portMap) {
+ engines = portMap.values().toArray(new HttpServerEngine[0]);
+ }
for (HttpServerEngine engine : engines)
{
if (engine.getBus() == getBus())
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2013-01-08 09:59:06 UTC (rev 17190)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2013-01-08 10:14:39 UTC (rev 17191)
@@ -196,7 +196,7 @@
}
//then setup a new TCCL having visibility over both the client path (JBossWS
//jaxws-client module on AS7) and the the former TCCL (i.e. the deployment classloader)
- setContextClassLoader(new DelegateClassLoader(clientClassLoader, origClassLoader));
+ setContextClassLoader(createDelegateClassLoader(clientClassLoader, origClassLoader));
return true;
}
return false;
@@ -214,6 +214,25 @@
}
return bus;
}
+
+ private static DelegateClassLoader createDelegateClassLoader(final ClassLoader clientClassLoader, final ClassLoader origClassLoader)
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return new DelegateClassLoader(clientClassLoader, origClassLoader);
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<DelegateClassLoader>()
+ {
+ public DelegateClassLoader run()
+ {
+ return new DelegateClassLoader(clientClassLoader, origClassLoader);
+ }
+ });
+ }
+ }
/**
* Get context classloader.
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-01-08 09:59:06 UTC (rev 17190)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-01-08 10:14:39 UTC (rev 17191)
@@ -198,6 +198,7 @@
<delete includeemptydirs="true" verbose="true">
<fileset dir="${jboss.modules}">
<include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/>
+ <include name="**/org/jboss/as/webservices/main/jbossws-jboss*"/>
</fileset>
</delete>
<antcall target="remove-jboss-integration-module">
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2013-01-08 09:59:06 UTC (rev 17190)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2013-01-08 10:14:39 UTC (rev 17191)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.stack.cxf.security.authentication;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.security.Principal;
import java.util.Calendar;
import java.util.ResourceBundle;
@@ -91,7 +93,7 @@
{
ClassLoader tccl = SecurityActions.getContextClassLoader();
//allow PicketBox to see jbossws modules' classes
- SecurityActions.setContextClassLoader(new DelegateClassLoader(ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(), tccl));
+ SecurityActions.setContextClassLoader(createDelegateClassLoader(ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(), tccl));
try
{
if (ctx.isValid(principal, password, subject) == false)
@@ -166,6 +168,25 @@
{
this.decodeNonce = decodeNonce;
}
+
+ private static DelegateClassLoader createDelegateClassLoader(final ClassLoader clientClassLoader, final ClassLoader origClassLoader)
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return new DelegateClassLoader(clientClassLoader, origClassLoader);
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<DelegateClassLoader>()
+ {
+ public DelegateClassLoader run()
+ {
+ return new DelegateClassLoader(clientClassLoader, origClassLoader);
+ }
+ });
+ }
+ }
private static Calendar unmarshalDateTime(String value)
{
11 years, 12 months
JBossWS SVN: r17190 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 04:59:06 -0500 (Tue, 08 Jan 2013)
New Revision: 17190
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
Log:
Merged revisions 17067 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r17067 | alessio.soldano(a)jboss.com | 2012-12-11 15:30:36 +0100 (Tue, 11 Dec 2012) | 2 lines
Few fixes / improvements
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996-16997,17042,17061
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996-16997,17042,17061,17067
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2013-01-08 09:36:33 UTC (rev 17189)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2013-01-08 09:59:06 UTC (rev 17190)
@@ -160,7 +160,6 @@
throw new WebServiceException(BundleUtils.getMessage(bundle, "HANDLER_CHAINS_ELEMENT_EXPECTED"));
}
- chain = new ArrayList<Handler>();
Node node = el.getFirstChild();
while (node != null) {
if (node instanceof Element) {
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-01-08 09:36:33 UTC (rev 17189)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-01-08 09:59:06 UTC (rev 17190)
@@ -24,6 +24,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapTransportFactory;
@@ -178,7 +179,8 @@
Map<String, String> props = wsmd.getProperties();
if (props != null && !props.isEmpty()) {
Map<String, Map<String, String>> queuesMap = new HashMap<String, Map<String,String>>();
- for (final String k : props.keySet()) {
+ for (Entry<String, String> e : props.entrySet()) {
+ String k = e.getKey();
if (k.startsWith(Constants.CXF_QUEUE_PREFIX)) {
String sk = k.substring(Constants.CXF_QUEUE_PREFIX.length());
int i = sk.indexOf(".");
@@ -190,13 +192,14 @@
m = new HashMap<String, String>();
queuesMap.put(queueName, m);
}
- m.put(queueProp, props.get(k));
+ m.put(queueProp, e.getValue());
}
}
}
WorkQueueManager mgr = bus.getExtension(WorkQueueManager.class);
- for (String queueName : queuesMap.keySet()) {
- AutomaticWorkQueue q = createWorkQueue(queueName, queuesMap.get(queueName));
+ for (Entry<String, Map<String, String>> e : queuesMap.entrySet()) {
+ final String queueName = e.getKey();
+ AutomaticWorkQueue q = createWorkQueue(queueName, e.getValue());
mgr.addNamedWorkQueue(queueName, q);
}
}
@@ -235,7 +238,7 @@
this.bus = bus;
}
- private class BusHolderLifeCycleListener implements BusLifeCycleListener
+ private static class BusHolderLifeCycleListener implements BusLifeCycleListener
{
private volatile boolean preShutdown = false;
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2013-01-08 09:36:33 UTC (rev 17189)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2013-01-08 09:59:06 UTC (rev 17190)
@@ -86,8 +86,14 @@
File tmpDir = IOUtils.createTempDirectory();
tmpFile = File.createTempFile("jbossws-cxf", ".xml", tmpDir);
Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile));
- writeTo(writer);
- writer.close();
+ try
+ {
+ writeTo(writer);
+ }
+ finally
+ {
+ writer.close();
+ }
return tmpFile.toURI().toURL();
}
11 years, 12 months
JBossWS SVN: r17189 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-01-08 04:36:33 -0500 (Tue, 08 Jan 2013)
New Revision: 17189
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameTestCase.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java
Log:
Merged revisions 16997,17042,17061 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16997 | alessio.soldano(a)jboss.com | 2012-11-15 10:45:52 +0100 (Thu, 15 Nov 2012) | 2 lines
Adding testcase for UT auth without callbackhandler
.......
r17042 | richard.opalka(a)jboss.com | 2012-11-27 10:49:36 +0100 (Tue, 27 Nov 2012) | 1 line
fixing test case
.......
r17061 | alessio.soldano(a)jboss.com | 2012-12-10 10:14:13 +0100 (Mon, 10 Dec 2012) | 2 lines
Use SecurityActions to get system props
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996-16997,17042,17061
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2013-01-08 09:29:13 UTC (rev 17188)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2013-01-08 09:36:33 UTC (rev 17189)
@@ -73,8 +73,8 @@
{
try
{
- String userCfgFile = System.getProperty(Configurer.USER_CFG_FILE_PROPERTY_NAME);
- String sysCfgFileUrl = System.getProperty(Configurer.USER_CFG_FILE_PROPERTY_URL);
+ String userCfgFile = SecurityActions.getSystemProperty(Configurer.USER_CFG_FILE_PROPERTY_NAME, null);
+ String sysCfgFileUrl = SecurityActions.getSystemProperty(Configurer.USER_CFG_FILE_PROPERTY_URL, null);
Resource r = BusApplicationContext.findResource(Configurer.DEFAULT_USER_CFG_FILE);
if (!customContextProvided && userCfgFile == null && cfgFiles == null && sysCfgFileUrl == null
&& (r == null || !r.exists()) && includeDefaults)
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameTestCase.java 2013-01-08 09:29:13 UTC (rev 17188)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameTestCase.java 2013-01-08 09:36:33 UTC (rev 17189)
@@ -77,6 +77,26 @@
}
}
+ public void testNoCBH() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsseNoCBH((BindingProvider)proxy, "kermit", "thefrog");
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ setupWsseNoCBH((BindingProvider)proxy, "kermit", "wrongpassword");
+ try
+ {
+ proxy.sayHello();
+ fail("User snoopy shouldn't be authenticated.");
+ }
+ catch (Exception e)
+ {
+ //OK
+ }
+ }
+
public void testJavaFirst() throws Exception
{
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "JavaFirstSecurityService");
@@ -110,4 +130,10 @@
proxy.getRequestContext().put(SecurityConstants.USERNAME, username);
proxy.getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, "org.jboss.test.ws.jaxws.samples.wsse.policy.basic.UsernamePasswordCallback");
}
+
+ private void setupWsseNoCBH(BindingProvider proxy, String username, String password)
+ {
+ proxy.getRequestContext().put(SecurityConstants.USERNAME, username);
+ proxy.getRequestContext().put(SecurityConstants.PASSWORD, password);
+ }
}
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java 2013-01-08 09:29:13 UTC (rev 17188)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java 2013-01-08 09:36:33 UTC (rev 17189)
@@ -22,22 +22,19 @@
package org.jboss.test.ws.saaj.jbws3084;
import java.net.URL;
-import java.util.Arrays;
import java.util.Iterator;
import javax.xml.namespace.QName;
-import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPConnection;
import javax.xml.soap.SOAPConnectionFactory;
import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPFactory;
import javax.xml.soap.SOAPMessage;
import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSCXFTestSetup;
/**
* [JBWS-3084] Enable control of chunked encoding when using SOAPConnection.
@@ -58,7 +55,10 @@
SOAPConnection con = conFac.createConnection();
URL endpoint = new URL(serviceURL);
- SOAPMessage response = con.get(endpoint);
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage msg = msgFactory.createMessage();
+ msg.getSOAPBody().addBodyElement(new QName("http://www.jboss.org/jbossws/saaj", "greetMe"));
+ SOAPMessage response = con.call(msg, endpoint);
QName greetMeResp = new QName("http://www.jboss.org/jbossws/saaj", "greetMeResponse");
Iterator<?> sayHiRespIterator = response.getSOAPBody().getChildElements(greetMeResp);
11 years, 12 months