August 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r14903 - legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/build.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-08-25 05:39:51 -0400 (Thu, 25 Aug 2011) New Revision: 14903 Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/build/version.properties Log: Updating version Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/build/version.properties =================================================================== --- legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/build/version.properties 2011-08-25 09:21:31 UTC (rev 14902) +++ legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/build/version.properties 2011-08-25 09:39:51 UTC (rev 14903) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-1.2 -version.id=1.2.1.GA_CP06 -repository.id=1.2.1.GA_CP06 +version.id=1.2.1.GA_CP06-patch-01 +repository.id=1.2.1.GA_CP06-patch-01 implementation.title=JBoss Web Services (JBossWS) implementation.url=http://www.jboss.org/products/jbossws

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r14902 - in legacy/tags/jbossws-1.2.1.GA_CP06-patch-01: jbossws-core/src/resources/schema and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-08-25 05:21:31 -0400 (Thu, 25 Aug 2011) New Revision: 14902 Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/ws-addr.xsd legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/wsdl20.xsd legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxrpc/jbws153/WEB-INF/web.xml legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-addr.xsd legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/wseventing/WEB-INF/wsdl/ws-addr.xsd Log: [JBPAPP-6879] Fix for 1.2.1.GA_CP06 Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java =================================================================== --- legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2011-08-25 09:18:00 UTC (rev 14901) +++ legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2011-08-25 09:21:31 UTC (rev 14902) @@ -67,6 +67,11 @@ public final class DOMUtils { private static Logger log = Logger.getLogger(DOMUtils.class); + + private static final String ENABLE_DOCTYPE_DECL = "org.jboss.ws.enable_doctype_decl"; + private static final String DISALLOW_DOCTYPE_DECL_FEATURE = "http://apache.org/xml/features/disallow-doctype-decl"; + + private static final boolean enableDoctypeDeclaration = Boolean.getBoolean(ENABLE_DOCTYPE_DECL); // All elements created by the same thread are created by the same builder and belong to the same doc private static ThreadLocal documentThreadLocal = new ThreadLocal(); @@ -77,6 +82,10 @@ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(false); factory.setNamespaceAware(true); + if (!enableDoctypeDeclaration) + { + factory.setFeature(DISALLOW_DOCTYPE_DECL_FEATURE, true); + } DocumentBuilder builder = factory.newDocumentBuilder(); builder.setEntityResolver(new JBossWSEntityResolver()); return builder; Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/ws-addr.xsd =================================================================== --- legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/ws-addr.xsd 2011-08-25 09:18:00 UTC (rev 14901) +++ legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-core/src/resources/schema/ws-addr.xsd 2011-08-25 09:21:31 UTC (rev 14902) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> +  -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> + <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://www.w3.org/2003/11/wsdl" targetNamespace="http://www.w3.org/2003/11/wsdl" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified"> Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxrpc/jbws153/WEB-INF/web.xml =================================================================== --- legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxrpc/jbws153/WEB-INF/web.xml 2011-08-25 09:18:00 UTC (rev 14901) +++ legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxrpc/jbws153/WEB-INF/web.xml 2011-08-25 09:21:31 UTC (rev 14902) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> + <web-app id="WebApp_ID"> <display-name>include-test</display-name> Modified: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-addr.xsd =================================================================== --- legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-addr.xsd 2011-08-25 09:18:00 UTC (rev 14901) +++ legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/jbossws-tests/src/resources/jaxws/samples/wseventing/WEB-INF/wsdl/ws-addr.xsd 2011-08-25 09:21:31 UTC (rev 14902) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> +  <!-- W3C XML Schema defined in the Web Services Addressing 1.0 specification http://www.w3.org/TR/ws-addr-core

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r14901 - legacy/tags.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-08-25 05:18:00 -0400 (Thu, 25 Aug 2011) New Revision: 14901 Added: legacy/tags/jbossws-1.2.1.GA_CP06-patch-01/ Log: Preparing 1.2.1.GA_CP06-patch-01

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r14900 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-08-24 10:44:26 -0400 (Wed, 24 Aug 2011) New Revision: 14900 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml Log: [JBPAPP-7074] Fixing jbossws-installer-macros.xml to copy jbossws-cxf-factories.jar Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml 2011-08-24 09:56:25 UTC (rev 14899) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml 2011-08-24 14:44:26 UTC (rev 14900) @@ -55,7 +55,7 @@ </patternset> <patternset id="jbossws.lib.endorsed.patternset"> - <include name="**/nothing-to-deploy"/> + <include name="**/jbossws-cxf-factories.jar"/> </patternset> <patternset id="jbossws.server.lib.patternset"> @@ -75,6 +75,7 @@ <include name="**/jaxws-api.jar"/> <include name="**/jbossws-cxf-client*.jar"/> <include name="**/jbossws-cxf-server*.jar"/> + <include name="**/jbossws-cxf-factories.jar"/>  <include name="**/neethi.jar"/> <include name="**/spring-beans.jar"/>

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r14899 - common/tags/jbossws-common-2.0.0.Beta6.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-08-24 05:56:25 -0400 (Wed, 24 Aug 2011) New Revision: 14899 Modified: common/tags/jbossws-common-2.0.0.Beta6/pom.xml Log: Update pom.xml Modified: common/tags/jbossws-common-2.0.0.Beta6/pom.xml =================================================================== --- common/tags/jbossws-common-2.0.0.Beta6/pom.xml 2011-08-24 09:45:08 UTC (rev 14898) +++ common/tags/jbossws-common-2.0.0.Beta6/pom.xml 2011-08-24 09:56:25 UTC (rev 14899) @@ -9,25 +9,25 @@ <packaging>jar</packaging> <description>JBossWS Common</description> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0.Beta6</version>  <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.10-SNAPSHOT</version> + <version>1.0.10.Alpha2</version> </parent>  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/common/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/tags/jbossws-common...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/tags/jbossws-common-2....</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/common/tags/jbossws-common-2.0.0...</url> </scm>  <properties> - <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version> + <jbossws.spi.version>2.0.0.Beta7</jbossws.spi.version> <jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version> <jboss.common.core.version>2.2.14.GA</jboss.common.core.version> <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r14898 - common/tags.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-08-24 05:45:08 -0400 (Wed, 24 Aug 2011) New Revision: 14898 Added: common/tags/jbossws-common-2.0.0.Beta6/ Log: Tag jbossws-common-2.0.0.Beta6

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r14897 - spi/tags/jbossws-spi-2.0.0.Beta7.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-08-24 05:21:43 -0400 (Wed, 24 Aug 2011) New Revision: 14897 Modified: spi/tags/jbossws-spi-2.0.0.Beta7/pom.xml Log: Update version number Modified: spi/tags/jbossws-spi-2.0.0.Beta7/pom.xml =================================================================== --- spi/tags/jbossws-spi-2.0.0.Beta7/pom.xml 2011-08-24 08:48:55 UTC (rev 14896) +++ spi/tags/jbossws-spi-2.0.0.Beta7/pom.xml 2011-08-24 09:21:43 UTC (rev 14897) @@ -7,25 +7,25 @@ <packaging>jar</packaging> <description>JBossWS SPI</description> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0.Beta7</version>  <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.10-SNAPSHOT</version> + <version>1.0.10.Alpha2</version> </parent>  <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.0.0...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.0.0.Beta7</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-2.0.0.Beta7</url> </scm>  <properties> - <jbossws.api.version>1.0.0-SNAPSHOT</jbossws.api.version> + <jbossws.api.version>1.0.0.Beta2</jbossws.api.version> <jms.api.version>1.0.0.Final</jms.api.version> <jboss.microcontainer.version>2.0.8.GA</jboss.microcontainer.version> <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r14896 - spi/tags.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-08-24 04:48:55 -0400 (Wed, 24 Aug 2011) New Revision: 14896 Added: spi/tags/jbossws-spi-2.0.0.Beta7/ Log: Tag jbossws-spi-2.0.0.Beta7

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r14895 - in stack/cxf/trunk/modules/testsuite/cxf-spring-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-08-23 06:30:54 -0400 (Tue, 23 Aug 2011) New Revision: 14895 Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameHelper.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml Log: Adding additional testcase with deployed client using WS-Security Username Token Profile Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2011-08-22 11:17:11 UTC (rev 14894) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2011-08-23 10:30:54 UTC (rev 14895) @@ -130,6 +130,20 @@ <attribute name="Dependencies" value="org.apache.ws.security"/> </manifest> </war> + <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-client.war" + needxmlfile='false'> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/UsernameHelper.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/UsernamePasswordCallback.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/wsf/test/TestServlet.class"/> + <include name="org/jboss/wsf/test/ClientHelper.class"/> + </classes> + <manifest> + <attribute name="Dependencies" value="org.apache.ws.security,org.jboss.ws.cxf.jbossws-cxf-client services"/> + </manifest> + </war>  <war Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameHelper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameHelper.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameHelper.java 2011-08-23 10:30:54 UTC (rev 14895) @@ -0,0 +1,126 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jaxws.samples.wsse; + +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; +import org.apache.cxf.endpoint.Client; +import org.apache.cxf.endpoint.Endpoint; +import org.apache.cxf.frontend.ClientProxy; +import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; +import org.jboss.logging.Logger; +import org.jboss.wsf.test.ClientHelper; + +public class UsernameHelper implements ClientHelper +{ + private String endpointURL; + + public UsernameHelper() + { + + } + + public UsernameHelper(String endpointURL) + { + setTargetEndpoint(endpointURL); + } + + public boolean test() throws Exception + { + Bus bus = BusFactory.newInstance().createBus(); + try + { + BusFactory.setThreadDefaultBus(bus); + + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService"); + URL wsdlURL = new URL(endpointURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); + setupWsse(proxy, "kermit"); + + return ("Secure Hello World!".equals(proxy.sayHello())); + } + finally + { + bus.shutdown(true); + } + } + + public boolean testWrongPassword() throws Exception + { + Bus bus = BusFactory.newInstance().createBus(); + try + { + BusFactory.setThreadDefaultBus(bus); + + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService"); + URL wsdlURL = new URL(endpointURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface) service.getPort(ServiceIface.class); + setupWsse(proxy, "snoopy"); + try + { + proxy.sayHello(); + Logger.getLogger(this.getClass()).error("User snoopy shouldn't be authenticated."); + return false; + } + catch (Exception e) + { + return true; + } + } + finally + { + bus.shutdown(true); + } + } + + + private void setupWsse(ServiceIface proxy, String username) + { + Client client = ClientProxy.getClient(proxy); + Endpoint cxfEndpoint = client.getEndpoint(); + + Map<String,Object> outProps = new HashMap<String,Object>(); + outProps.put("action", "UsernameToken"); + outProps.put("user", username); + outProps.put("passwordType", "PasswordText"); + outProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsse.UsernamePasswordCallback"); + WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request + cxfEndpoint.getOutInterceptors().add(wssOut); + cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor()); + } + + @Override + public void setTargetEndpoint(String address) + { + this.endpointURL = address; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java 2011-08-23 10:30:54 UTC (rev 14895) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jaxws.samples.wsse; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +/** + * WS-Security username test case + * + * @author alessio.soldano(a)jboss.com + * @since 22-Aug-2010 + */ +public final class UsernameServletTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSCXFTestSetup(UsernameServletTestCase.class,"jaxws-samples-wsse-username.war, jaxws-samples-wsse-username-client.war"); + } + + public void test() throws Exception + { + assertEquals("1", runTestInContainer("test")); + } + + public void testWrongPassword() throws Exception + { + assertEquals("1", runTestInContainer("testWrongPassword")); + } + + private String runTestInContainer(String test) throws Exception + { + URL url = new URL("http://" + getServerHost() + + ":8080/jaxws-samples-wsse-username-client?path=/jaxws-samples-wsse-username&method=" + test + + "&helper=" + UsernameHelper.class.getName()); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + return br.readLine(); + } +}

12 years, 8 months

1
0
0 / 0

JBossWS SVN: r14894 - stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap.

by jbossws-commits＠lists.jboss.org

Author: mmusaji Date: 2011-08-22 07:17:11 -0400 (Mon, 22 Aug 2011) New Revision: 14894 Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java Log: JBPAPP-6864 Added check for System Property ignore.parse.error to keep backward compatibility for ignoreParseError field Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-17 19:22:09 UTC (rev 14893) +++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2011-08-22 11:17:11 UTC (rev 14894) @@ -60,6 +60,8 @@ { // provide logging private static Logger log = Logger.getLogger(EnvelopeBuilderDOM.class); + + private static final String IGNORE_PARSE_ERROR_PROPERTY = System.getProperty("ignore.parse.error", "true"); private SOAPFactoryImpl soapFactory = new SOAPFactoryImpl(); private Style style; @@ -86,12 +88,13 @@ } catch (IOException ex) { - if (ignoreParseError) - { + if(IGNORE_PARSE_ERROR_PROPERTY.equalsIgnoreCase("false")) { + QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; + throw new CommonSOAPFaultException(faultCode, ex); + }else if (ignoreParseError) { //kept for backward compatibility return null; } - QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; - throw new CommonSOAPFaultException(faultCode, ex); + } return build(soapMessage, domEnv); @@ -109,12 +112,12 @@ } catch (IOException ex) { - if (ignoreParseError) - { + if(IGNORE_PARSE_ERROR_PROPERTY.equalsIgnoreCase("false")) { + QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; + throw new CommonSOAPFaultException(faultCode, ex); + }else if (ignoreParseError) { //kept for backward compatibility return null; } - QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; - throw new CommonSOAPFaultException(faultCode, ex.getMessage()); } return build(soapMessage, domEnv); Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2011-08-17 19:22:09 UTC (rev 14893) +++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2011-08-22 11:17:11 UTC (rev 14894) @@ -47,7 +47,7 @@ try { - SOAPMessage soapMsg = getMessageFactory().createMessage(null, inputStream, false); + SOAPMessage soapMsg = getMessageFactory().createMessage(null, inputStream, true); return soapMsg; } Modified: stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2011-08-17 19:22:09 UTC (rev 14893) +++ stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2011-08-22 11:17:11 UTC (rev 14894) @@ -79,8 +79,7 @@ if (resCode != HttpServletResponse.SC_NO_CONTENT) { MimeHeaders mimeHeaders = getMimeHeaders(metadata); - //[JBWS-2651] modify the ignoreParseError to false - soapMsg = getMessageFactory().createMessage(mimeHeaders, inputStream, false); + soapMsg = getMessageFactory().createMessage(mimeHeaders, inputStream, true); } return soapMsg;

12 years, 8 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 August 2011