February 2014 - jbossws-commits - Jboss List Archives

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-02-13 10:06:38 -0500 (Thu, 13 Feb 2014) New Revision: 18363 Modified: stack/cxf/trunk/pom.xml Log: Use jbossws-native 4.2.0.CR1 Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2014-02-13 14:28:18 UTC (rev 18362) +++ stack/cxf/trunk/pom.xml 2014-02-13 15:06:38 UTC (rev 18363) @@ -64,7 +64,7 @@ <jbossws.common.version>2.3.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> <jbossws.jboss720.version>4.3.0-SNAPSHOT</jbossws.jboss720.version> - <jbossws.native.version>4.1.3-SNAPSHOT</jbossws.native.version> + <jbossws.native.version>4.2.0.CR1</jbossws.native.version> <jboss720.version>7.2.0.Final</jboss720.version> <wildfly800.version>8.0.0.Final-SNAPSHOT</wildfly800.version> <ejb.api.version>1.0.2.Final</ejb.api.version>

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18362 - in stack/native/trunk: modules/core and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-02-13 09:28:18 -0500 (Thu, 13 Feb 2014) New Revision: 18362 Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/resources/pom.xml stack/native/trunk/modules/services/pom.xml stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: Prepare for next dev cycle Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2014-02-13 14:23:59 UTC (rev 18361) +++ stack/native/trunk/modules/core/pom.xml 2014-02-13 14:28:18 UTC (rev 18362) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.2.0.CR1</version> + <version>4.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2014-02-13 14:23:59 UTC (rev 18361) +++ stack/native/trunk/modules/dist/pom.xml 2014-02-13 14:28:18 UTC (rev 18362) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.2.0.CR1</version> + <version>4.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2014-02-13 14:23:59 UTC (rev 18361) +++ stack/native/trunk/modules/resources/pom.xml 2014-02-13 14:28:18 UTC (rev 18362) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.2.0.CR1</version> + <version>4.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/trunk/modules/services/pom.xml =================================================================== --- stack/native/trunk/modules/services/pom.xml 2014-02-13 14:23:59 UTC (rev 18361) +++ stack/native/trunk/modules/services/pom.xml 2014-02-13 14:28:18 UTC (rev 18362) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.2.0.CR1</version> + <version>4.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2014-02-13 14:23:59 UTC (rev 18361) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2014-02-13 14:28:18 UTC (rev 18362) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>4.2.0.CR1</version> + <version>4.2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2014-02-13 14:23:59 UTC (rev 18361) +++ stack/native/trunk/modules/testsuite/pom.xml 2014-02-13 14:28:18 UTC (rev 18362) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.2.0.CR1</version> + <version>4.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2014-02-13 14:23:59 UTC (rev 18361) +++ stack/native/trunk/pom.xml 2014-02-13 14:28:18 UTC (rev 18362) @@ -31,7 +31,7 @@ <packaging>pom</packaging> <description>JBossWS Native stack</description> - <version>4.2.0.CR1</version> + <version>4.2.0-SNAPSHOT</version>  <parent> @@ -42,9 +42,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/trunk</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</url> </scm>  @@ -57,11 +57,11 @@  <properties> <jbossws.api.version>1.0.2.Final</jbossws.api.version> - <jbossws.spi.version>2.3.0.Beta4</jbossws.spi.version> - <jbossws.common.version>2.3.0.Beta2</jbossws.common.version> + <jbossws.spi.version>2.3.0-SNAPSHOT</jbossws.spi.version> + <jbossws.common.version>2.3.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.2.0.Beta1</jbossws.shared.testsuite.version> - <jbossws.jboss720.version>4.3.0.Beta2</jbossws.jboss720.version> + <jbossws.jboss720.version>4.3.0-SNAPSHOT</jbossws.jboss720.version> <jboss720.version>7.2.0.Final</jboss720.version> <javassist.version>3.15.0-GA</javassist.version> <ejb.api.version>1.0.1.Final</ejb.api.version>

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18361 - stack/native/tags.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-02-13 09:23:59 -0500 (Thu, 13 Feb 2014) New Revision: 18361 Added: stack/native/tags/jbossws-native-4.2.0.CR1/ Log: Tagging jbossws-native-4.2.0.CR1

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18360 - in stack/native/trunk: modules/core and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-02-13 09:23:26 -0500 (Thu, 13 Feb 2014) New Revision: 18360 Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/resources/pom.xml stack/native/trunk/modules/services/pom.xml stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: Preparing for tagging Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2014-02-13 14:11:31 UTC (rev 18359) +++ stack/native/trunk/modules/core/pom.xml 2014-02-13 14:23:26 UTC (rev 18360) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.2.0-SNAPSHOT</version> + <version>4.2.0.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2014-02-13 14:11:31 UTC (rev 18359) +++ stack/native/trunk/modules/dist/pom.xml 2014-02-13 14:23:26 UTC (rev 18360) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.2.0-SNAPSHOT</version> + <version>4.2.0.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2014-02-13 14:11:31 UTC (rev 18359) +++ stack/native/trunk/modules/resources/pom.xml 2014-02-13 14:23:26 UTC (rev 18360) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.2.0-SNAPSHOT</version> + <version>4.2.0.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/trunk/modules/services/pom.xml =================================================================== --- stack/native/trunk/modules/services/pom.xml 2014-02-13 14:11:31 UTC (rev 18359) +++ stack/native/trunk/modules/services/pom.xml 2014-02-13 14:23:26 UTC (rev 18360) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.2.0-SNAPSHOT</version> + <version>4.2.0.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2014-02-13 14:11:31 UTC (rev 18359) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2014-02-13 14:23:26 UTC (rev 18360) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>4.2.0-SNAPSHOT</version> + <version>4.2.0.CR1</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2014-02-13 14:11:31 UTC (rev 18359) +++ stack/native/trunk/modules/testsuite/pom.xml 2014-02-13 14:23:26 UTC (rev 18360) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>4.2.0-SNAPSHOT</version> + <version>4.2.0.CR1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2014-02-13 14:11:31 UTC (rev 18359) +++ stack/native/trunk/pom.xml 2014-02-13 14:23:26 UTC (rev 18360) @@ -31,7 +31,7 @@ <packaging>pom</packaging> <description>JBossWS Native stack</description> - <version>4.2.0-SNAPSHOT</version> + <version>4.2.0.CR1</version>  <parent> @@ -42,9 +42,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url> </scm>  @@ -57,11 +57,11 @@  <properties> <jbossws.api.version>1.0.2.Final</jbossws.api.version> - <jbossws.spi.version>2.3.0-SNAPSHOT</jbossws.spi.version> - <jbossws.common.version>2.3.0-SNAPSHOT</jbossws.common.version> + <jbossws.spi.version>2.3.0.Beta4</jbossws.spi.version> + <jbossws.common.version>2.3.0.Beta2</jbossws.common.version> <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.2.0.Beta1</jbossws.shared.testsuite.version> - <jbossws.jboss720.version>4.3.0-SNAPSHOT</jbossws.jboss720.version> + <jbossws.jboss720.version>4.3.0.Beta2</jbossws.jboss720.version> <jboss720.version>7.2.0.Final</jboss720.version> <javassist.version>3.15.0-GA</javassist.version> <ejb.api.version>1.0.1.Final</ejb.api.version>

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18359 - spi/tags/jbossws-spi-2.3.0.Beta4.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-02-13 09:11:31 -0500 (Thu, 13 Feb 2014) New Revision: 18359 Modified: spi/tags/jbossws-spi-2.3.0.Beta4/pom.xml Log: Fixing pom.xml Modified: spi/tags/jbossws-spi-2.3.0.Beta4/pom.xml =================================================================== --- spi/tags/jbossws-spi-2.3.0.Beta4/pom.xml 2014-02-13 14:05:16 UTC (rev 18358) +++ spi/tags/jbossws-spi-2.3.0.Beta4/pom.xml 2014-02-13 14:11:31 UTC (rev 18359) @@ -7,7 +7,7 @@ <packaging>jar</packaging> <description>JBossWS SPI</description> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta4</version>  <parent> @@ -18,9 +18,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.3.0...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.3.0.Beta4</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-2.3.0.Beta4</url> </scm>

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18358 - spi/tags.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-02-13 09:05:16 -0500 (Thu, 13 Feb 2014) New Revision: 18358 Added: spi/tags/jbossws-spi-2.3.0.Beta4/ Log: Tagging jbossws-spi-2.3.0.Beta4

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18357 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core: soap and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-02-13 08:23:39 -0500 (Thu, 13 Feb 2014) New Revision: 18357 Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/OneWayUnMarshallerHTTP.java Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnection.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java Log: [JBWS-3761] svn merge -r 18343:18344 https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws-native-... . Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2014-02-13 13:14:27 UTC (rev 18356) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2014-02-13 13:23:39 UTC (rev 18357) @@ -112,7 +112,7 @@ callProps.put(StubExt.PROPERTY_CHUNKED_ENCODING_SIZE, 0); } - NettyClient client = new NettyClient(getMarshaller(), getUnmarshaller()); + NettyClient client = new NettyClient(getMarshaller(), getUnmarshaller(oneway)); if (chunkSize != null) { client.setChunkSize(chunkSize); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnection.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnection.java 2014-02-13 13:14:27 UTC (rev 18356) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/RemoteConnection.java 2014-02-13 13:23:39 UTC (rev 18357) @@ -35,7 +35,7 @@ { Marshaller getMarshaller(); - UnMarshaller getUnmarshaller(); + UnMarshaller getUnmarshaller(boolean oneway); SOAPMessage invoke(SOAPMessage reqMessage, Object endpoint, boolean oneway) throws IOException; } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2014-02-13 13:14:27 UTC (rev 18356) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2014-02-13 13:23:39 UTC (rev 18357) @@ -30,6 +30,7 @@ import org.jboss.ws.core.soap.SOAPMessageMarshaller; import org.jboss.ws.core.soap.SOAPMessageUnMarshallerHTTP; +import org.jboss.ws.core.soap.OneWayUnMarshallerHTTP; /** * SOAPConnection implementation @@ -40,9 +41,12 @@ */ public class SOAPProtocolConnectionHTTP extends HTTPRemotingConnection { - public UnMarshaller getUnmarshaller() + public UnMarshaller getUnmarshaller(boolean oneway) { - return new SOAPMessageUnMarshallerHTTP(); + if(oneway) + return new OneWayUnMarshallerHTTP(); + else + return new SOAPMessageUnMarshallerHTTP(); } public Marshaller getMarshaller() Copied: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/OneWayUnMarshallerHTTP.java (from rev 18344, stack/native/branches/jbossws-native-4.1.x/modules/core/src/main/java/org/jboss/ws/core/soap/OneWayUnMarshallerHTTP.java) =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/OneWayUnMarshallerHTTP.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/OneWayUnMarshallerHTTP.java 2014-02-13 13:23:39 UTC (rev 18357) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, 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.ws.core.soap; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; + +import org.jboss.ws.WSException; +import org.jboss.ws.core.client.UnMarshaller; +import org.jboss.ws.core.client.transport.NettyClient; + +public class OneWayUnMarshallerHTTP implements UnMarshaller +{ + public Object read(InputStream inputStream, Map<String, Object> metadata, Map<String, Object> headers) throws IOException + { + Integer resCode = (Integer)metadata.get(NettyClient.RESPONSE_CODE); + if(!resCode.equals(200)) + { + throw new WSException("One-way operation returned invalid HTTP response: " + resCode); + } + return null; + } +}

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18356 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools: wsdl and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-02-13 08:14:27 -0500 (Thu, 13 Feb 2014) New Revision: 18356 Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ServerSideDocumentBuilder.java Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java Log: [JBWS-3763] [BZ-966752] svn merge -r 18098:18099 https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws-native-... . Copied: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ServerSideDocumentBuilder.java (from rev 18099, stack/native/branches/jbossws-native-4.1.x/modules/core/src/main/java/org/jboss/ws/tools/ServerSideDocumentBuilder.java) =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ServerSideDocumentBuilder.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/ServerSideDocumentBuilder.java 2014-02-13 13:14:27 UTC (rev 18356) @@ -0,0 +1,23 @@ +package org.jboss.ws.tools; + +import javax.xml.parsers.DocumentBuilderFactory; + +/** + * Require the TCCL to this framework's classloader. + * + * User: rsearls + * Date: 11/20/13 + */ +public class ServerSideDocumentBuilder { + public static DocumentBuilderFactory createDocumentBuilderFactory() { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + DocumentBuilderFactory factory; + try { + Thread.currentThread().setContextClassLoader(ServerSideDocumentBuilder.class.getClassLoader()); + factory = DocumentBuilderFactory.newInstance(); + } finally { + Thread.currentThread().setContextClassLoader(cl); + } + return factory; + } +} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java 2014-02-13 13:04:04 UTC (rev 18355) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java 2014-02-13 13:14:27 UTC (rev 18356) @@ -68,6 +68,7 @@ import org.jboss.ws.NativeMessages; import org.jboss.ws.common.utils.JBossWSEntityResolver; +import org.jboss.ws.tools.ServerSideDocumentBuilder; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -2142,7 +2143,7 @@ private static Document getDocument(InputSource inputSource, String desc) throws WSDLException { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilderFactory factory = ServerSideDocumentBuilder.createDocumentBuilderFactory(); factory.setNamespaceAware(true); factory.setValidating(false); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2014-02-13 13:04:04 UTC (rev 18355) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2014-02-13 13:14:27 UTC (rev 18356) @@ -43,6 +43,7 @@ import org.jboss.ws.common.utils.ResourceURL; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLException; +import org.jboss.ws.tools.ServerSideDocumentBuilder; import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -168,7 +169,7 @@ InputStream inputStream = new ResourceURL(wsdlLocation).openStream(); try { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilderFactory factory = ServerSideDocumentBuilder.createDocumentBuilderFactory(); factory.setNamespaceAware(true); factory.setValidating(false);

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18355 - in stack/native/trunk/modules/core/src/main/java/org/jboss: wsf/stack/jbws and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-02-13 08:04:04 -0500 (Thu, 13 Feb 2014) New Revision: 18355 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java Log: [JBWS-3717] svn merge -r 17989:17990 https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws-native-... . Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java 2014-02-13 11:45:16 UTC (rev 18354) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java 2014-02-13 13:04:04 UTC (rev 18355) @@ -26,6 +26,7 @@ import org.jboss.ws.NativeLoggers; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointState; import org.jboss.wsf.spi.management.EndpointResolver; /** @@ -55,16 +56,19 @@ while(endpoints.hasNext()) { Endpoint auxEndpoint = endpoints.next(); - ServerEndpointMetaData sepMetaData = auxEndpoint.getAttachment(ServerEndpointMetaData.class); - if (pcName.equals(sepMetaData.getPortComponentName())) + if (EndpointState.STARTED.equals(auxEndpoint.getState())) { - if (endpoint != null) + ServerEndpointMetaData sepMetaData = auxEndpoint.getAttachment(ServerEndpointMetaData.class); + if (pcName.equals(sepMetaData.getPortComponentName())) { - NativeLoggers.ROOT_LOGGER.multipleServiceEndpointFoundFor(pcLink); - endpoint = null; - break; + if (endpoint != null) + { + NativeLoggers.ROOT_LOGGER.multipleServiceEndpointFoundFor(pcLink); + endpoint = null; + break; + } + endpoint = auxEndpoint; } - endpoint = auxEndpoint; } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java 2014-02-13 11:45:16 UTC (rev 18354) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java 2014-02-13 13:04:04 UTC (rev 18355) @@ -26,6 +26,7 @@ import javax.management.ObjectName; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.EndpointState; import org.jboss.wsf.spi.management.EndpointResolver; /** @@ -55,13 +56,16 @@ while(endpoints.hasNext()) { Endpoint auxEndpoint = endpoints.next(); - ObjectName sepId = auxEndpoint.getName(); - String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); - String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) + if (EndpointState.STARTED.equals(auxEndpoint.getState())) { - endpoint = auxEndpoint; - break; + ObjectName sepId = auxEndpoint.getName(); + String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); + String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) + { + endpoint = auxEndpoint; + break; + } } }

10 years, 2 months

1
0
0 / 0

JBossWS SVN: r18354 - in stack/native/trunk: modules/core/src/main/scripts and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-02-13 06:45:16 -0500 (Thu, 13 Feb 2014) New Revision: 18354 Removed: stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/ stack/native/trunk/modules/testsuite/src/test/resources/jboss800/ Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml stack/native/trunk/modules/dist/src/main/distro/build-setup.xml stack/native/trunk/modules/resources/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: Remove jboss800 target; WildfFly will never have jaxrpc support and hence never use jbossws-native at all Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -34,11 +34,6 @@ tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> - <copy - file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - </target> </project> Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/dist/pom.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -34,13 +34,6 @@ </dependency> <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-resources</artifactId> - <version>${project.version}</version> - <classifier>jboss800</classifier> - </dependency> - - <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common-tools</artifactId> <scope>provided</scope> Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -52,33 +52,6 @@ </target>  -  -  - - <target name="deploy-structure-jboss80x" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - - <path id="jbossws-common.path"> - <fileset dir="${deploy.artifacts.dir}"> - <include name="**/jbossws-common-tools.jar"/> - </fileset> - </path> - <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> - - <antcall target="deploy-jbossws-native-modules" inheritall="false"> - <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="modules-jbossid" value="jboss800"/> - </antcall> - <copy toDir="${deploy.structure}/modules/system/layers/base"> - <fileset dir="${deploy.artifacts.dir}/modules/jboss800"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> - </target> - -    @@ -107,33 +80,4 @@ <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target> -  -  -  - - <target name="target-jboss800"> - <property name="jbossws.integration.target" value="jboss800"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss800" depends="undeploy-jboss800,deploy-structure-jboss80x" description="Deploy jbossws to jboss800"> - <fail message="Not available: ${jboss800.available.file}" unless="jboss800.available"/> - <copy todir="${jboss800.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"> - <exclude name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> -  - <installModules targetDir="${jboss800.home}/modules/system/layers/base/"> - <fileset dir="${deploy.structure}/modules/system/layers/base"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss800" depends="target-jboss800,init" description="Remove jbossws from jboss800"> - <fail message="Not available: ${jboss800.available.file}" unless="jboss800.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss800.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> - </target> - </project> Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -35,10 +35,8 @@ <property name="jboss.server.instance" value="default"/> <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/> - <property name="jboss800.available.file" value="${jboss800.home}/jboss-modules.jar"/> <available property="jboss720.available" file="${jboss720.available.file}"/> - <available property="jboss800.available" file="${jboss800.available.file}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/resources/pom.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -51,15 +51,6 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss720/jbossws.beans</classesDirectory> </configuration> </execution> - <execution> - <id>jboss800</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss800</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss800/jbossws.beans</classesDirectory> - </configuration> - </execution> </executions> </plugin> </plugins> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/testsuite/pom.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -281,37 +281,6 @@ </profile>  - <profile> - <id>jboss800</id> - <properties> - <jboss.version>${jboss800.version}</jboss.version> - <jbossws.integration.target>jboss800</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args}</argLine> - <excludes> -  - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> -  - <profile> - <id>jboss800</id> - <properties> - <jbossws.integration.target>jboss800</jbossws.integration.target> - <jboss.home>${jboss800.home}</jboss.home> - </properties> - </profile> - -

10 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2014