JBossWS SVN: r9919 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961: src/main/java/org/jboss/ws/core/utils and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-29 06:27:16 -0400 (Wed, 29 Apr 2009)
New Revision: 9919
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/AttackedEndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/Endpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/EndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/attack-web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/service.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/attack-message.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/message.xml
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/core/utils/DocumentBuilderFactoryImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java
Log:
[JBWS-1582][JBPAPP-1961] backport
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/ant-import-tests/build-jars-jaxws.xml 2009-04-29 10:25:44 UTC (rev 9918)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/ant-import-tests/build-jars-jaxws.xml 2009-04-29 10:27:16 UTC (rev 9919)
@@ -310,6 +310,26 @@
</metainf>
</jar>
+ <!-- jaxws-jbws1582 -->
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws1582.war" webxml="${tests.output.dir}/resources/jaxws/jbws1582/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1582/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1582/EndpointImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws1582/WEB-INF">
+ <include name="wsdl/service.wsdl"/>
+ </webinf>
+ </war>
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws1582-attacked.war" webxml="${tests.output.dir}/resources/jaxws/jbws1582/WEB-INF/attack-web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1582/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1582/AttackedEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws1582/WEB-INF">
+ <include name="wsdl/attack-service.wsdl"/>
+ </webinf>
+ </war>
+
<!-- jaxws-jbws2116-->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws2116.jar">
<fileset dir="${tests.output.dir}/classes">
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/core/utils/DocumentBuilderFactoryImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/core/utils/DocumentBuilderFactoryImpl.java 2009-04-29 10:25:44 UTC (rev 9918)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/core/utils/DocumentBuilderFactoryImpl.java 2009-04-29 10:27:16 UTC (rev 9919)
@@ -23,6 +23,7 @@
// $Id$
+import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -53,6 +54,7 @@
// namespace aware by default
delegate.setNamespaceAware(true);
+ delegate.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
}
catch (Exception ex)
{
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2009-04-29 10:25:44 UTC (rev 9918)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2009-04-29 10:27:16 UTC (rev 9919)
@@ -45,6 +45,7 @@
import javax.management.MBeanServerFactory;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.xml.XMLConstants;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
@@ -522,6 +523,7 @@
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(true);
factory.setValidating(true);
+ factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema");
String[] notificationSchemas = es.getNotificationSchema();
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java 2009-04-29 10:25:44 UTC (rev 9918)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java 2009-04-29 10:27:16 UTC (rev 9919)
@@ -44,6 +44,7 @@
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLLocator;
import javax.wsdl.xml.WSDLReader;
+import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -2124,6 +2125,7 @@
try
{
+ factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
DocumentBuilder builder = factory.newDocumentBuilder();
builder.setEntityResolver( new JBossWSEntityResolver() );
Document doc = builder.parse(inputSource);
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/AttackedEndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/AttackedEndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/AttackedEndpointImpl.java 2009-04-29 10:27:16 UTC (rev 9919)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws1582;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ portName = "EndpointPort",
+ serviceName = "EndpointService",
+ wsdlLocation = "WEB-INF/wsdl/attack-service.wsdl",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws1582.Endpoint"
+)
+public class AttackedEndpointImpl
+{
+ public String echo(String msg)
+ {
+ return msg;
+ }
+}
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/Endpoint.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/Endpoint.java 2009-04-29 10:27:16 UTC (rev 9919)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws1582;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService (name="Endpoint")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface Endpoint
+{
+ @WebMethod(operationName = "echoString", action = "urn:EchoString")
+ String echo(String input);
+}
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/EndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/EndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/EndpointImpl.java 2009-04-29 10:27:16 UTC (rev 9919)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws1582;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ portName = "EndpointPort",
+ serviceName = "EndpointService",
+ wsdlLocation = "WEB-INF/wsdl/service.wsdl",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws1582.Endpoint"
+)
+public class EndpointImpl
+{
+ public String echo(String msg)
+ {
+ return msg;
+ }
+}
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2009-04-29 10:27:16 UTC (rev 9919)
@@ -0,0 +1,137 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws1582;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1582] Protect JBossWS Against XML Attacks
+ *
+ * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
+ */
+public class JBWS1582TestCase extends JBossWSTest
+{
+ private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-jbws1582/TestService";
+ private String targetNS = "http://jbws1582.jaxws.ws.test.jboss.org/";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1582TestCase.class, "jaxws-jbws1582.war");
+ }
+
+ public void testLegalAccess() throws Exception
+ {
+ URL wsdlURL = new URL(endpointURL + "?wsdl");
+ QName serviceName = new QName(targetNS, "EndpointService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+
+ Object retObj = port.echo("Hello");
+ assertEquals("Hello", retObj);
+ }
+
+ public void testSOAPMessage() throws Exception
+ {
+ String response = getResponse("jaxws/jbws1582/message.xml");
+ assertTrue(response.contains("HTTP/1.1 200 OK"));
+ assertTrue(response.contains("<return>Hello</return>"));
+ }
+
+ public void testSOAPMessageAttack() throws Exception
+ {
+ String response = getResponse("jaxws/jbws1582/attack-message.xml");
+ assertTrue(response.contains("HTTP/1.1 500"));
+ // There's a bug in xerces that is shipped with EAP 4.3.
+ // NPE thrown from xerces can be solved with xerces upgrade.
+ //assertTrue(response.contains("The parser has encountered more than"));
+ //assertTrue(response.contains("entity expansions in this document"));
+ }
+
+ private String getResponse(String requestFile) throws Exception
+ {
+ final String CRNL = "\r\n";
+ String content = getContent(new FileInputStream(new File("resources/" + requestFile)));
+ Socket socket = new Socket();
+ socket.connect(new InetSocketAddress(this.getServerHost(), 8080));
+ OutputStream out = socket.getOutputStream();
+
+ // send an HTTP request to the endpoint
+ out.write(("POST /jaxws-jbws1582/TestService HTTP/1.0" + CRNL).getBytes());
+ out.write(("Host: " + this.getServerHost() + ":8080" + CRNL).getBytes());
+ out.write(("Content-Type: text/xml" + CRNL).getBytes());
+ out.write(("Content-Length: " + content.length() + CRNL).getBytes());
+ out.write((CRNL).getBytes());
+ out.write((content).getBytes());
+
+ // read the response
+ String response = getContent(socket.getInputStream());
+ socket.close();
+ System.out.println("---");
+ System.out.println(response);
+ System.out.println("---");
+ return response;
+ }
+
+ public void testAttackedArchiveDeployment() throws Exception
+ {
+ try
+ {
+ this.deploy("jaxws-jbws1582-attacked.war");
+ fail("deployment failure expected");
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ log.warn(e.getMessage(), e);
+ }
+ finally
+ {
+ this.undeploy("jaxws-jbws1582-attacked.war");
+ }
+ }
+
+ private static String getContent(InputStream is) throws IOException
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ IOUtils.copyStream(baos, is);
+ return new String(baos.toByteArray());
+ }
+
+}
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/attack-web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/attack-web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/attack-web.xml 2009-04-29 10:27:16 UTC (rev 9919)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws1582.AttackedEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/web.xml 2009-04-29 10:27:16 UTC (rev 9919)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws1582.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl 2009-04-29 10:27:16 UTC (rev 9919)
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE definitions [
+ <!ENTITY hello1 "Hello">
+ <!ENTITY hello2 "&hello1; &hello1;">
+ <!ENTITY hello3 "&hello2; &hello2;">
+ <!ENTITY hello4 "&hello3; &hello3;">
+ <!ENTITY hello5 "&hello4; &hello4;">
+ <!ENTITY hello6 "&hello5; &hello5;">
+ <!ENTITY hello7 "&hello6; &hello6;">
+ <!ENTITY hello8 "&hello7; &hello7;">
+ <!ENTITY hello9 "&hello8; &hello8;">
+ <!ENTITY hello10 "&hello9; &hello9;">
+
+ <!ENTITY hello11 "&hello10; &hello10;">
+ <!ENTITY hello12 "&hello11; &hello11;">
+ <!ENTITY hello13 "&hello12; &hello12;">
+ <!ENTITY hello14 "&hello13; &hello13;">
+ <!ENTITY hello15 "&hello14; &hello14;">
+ <!ENTITY hello16 "&hello15; &hello15;">
+ <!ENTITY hello17 "&hello16; &hello16;">
+ <!ENTITY hello18 "&hello17; &hello17;">
+ <!ENTITY hello19 "&hello18; &hello18;">
+ <!ENTITY hello20 "&hello19; &hello19;">
+
+ <!ENTITY hello21 "&hello20; &hello20;">
+ <!ENTITY hello22 "&hello21; &hello21;">
+ <!ENTITY hello23 "&hello22; &hello22;">
+ <!ENTITY hello24 "&hello23; &hello23;">
+ <!ENTITY hello25 "&hello24; &hello24;">
+ <!ENTITY hello26 "&hello25; &hello25;">
+ <!ENTITY hello27 "&hello26; &hello26;">
+ <!ENTITY hello28 "&hello27; &hello27;">
+ <!ENTITY hello29 "&hello28; &hello28;">
+ <!ENTITY hello30 "&hello29; &hello29;">
+
+ <!ENTITY hello31 "&hello30; &hello30;">
+ <!ENTITY hello32 "&hello31; &hello31;">
+ <!ENTITY hello33 "&hello32; &hello32;">
+ <!ENTITY hello34 "&hello33; &hello33;">
+ <!ENTITY hello35 "&hello34; &hello34;">
+ <!ENTITY hello36 "&hello35; &hello35;">
+ <!ENTITY hello37 "&hello36; &hello36;">
+ <!ENTITY hello38 "&hello37; &hello37;">
+ <!ENTITY hello39 "&hello38; &hello38;">
+ <!ENTITY hello40 "&hello39; &hello39;">
+
+ <!ENTITY hello41 "&hello40; &hello40;">
+ <!ENTITY hello42 "&hello41; &hello41;">
+ <!ENTITY hello43 "&hello42; &hello42;">
+ <!ENTITY hello44 "&hello43; &hello43;">
+ <!ENTITY hello45 "&hello44; &hello44;">
+ <!ENTITY hello46 "&hello45; &hello45;">
+ <!ENTITY hello47 "&hello46; &hello46;">
+ <!ENTITY hello48 "&hello47; &hello47;">
+ <!ENTITY hello49 "&hello48; &hello48;">
+ <!ENTITY hello50 "&hello49; &hello49;">
+
+ <!ENTITY hello51 "&hello50; &hello50;">
+ <!ENTITY hello52 "&hello51; &hello51;">
+ <!ENTITY hello53 "&hello52; &hello52;">
+ <!ENTITY hello54 "&hello53; &hello53;">
+ <!ENTITY hello55 "&hello54; &hello54;">
+ <!ENTITY hello56 "&hello55; &hello55;">
+ <!ENTITY hello57 "&hello56; &hello56;">
+ <!ENTITY hello58 "&hello57; &hello57;">
+ <!ENTITY hello59 "&hello58; &hello58;">
+ <!ENTITY hello60 "&hello59; &hello59;">
+
+ <!ENTITY hello61 "&hello60; &hello60;">
+ <!ENTITY hello62 "&hello61; &hello61;">
+ <!ENTITY hello63 "&hello62; &hello62;">
+ <!ENTITY hello64 "&hello63; &hello63;">
+ <!ENTITY hello65 "&hello64; &hello64;">
+ <!ENTITY hello66 "&hello65; &hello65;">
+ <!ENTITY hello67 "&hello66; &hello66;">
+ <!ENTITY hello68 "&hello67; &hello67;">
+ <!ENTITY hello69 "&hello68; &hello68;">
+ <!ENTITY hello70 "&hello69; &hello69;">
+
+ <!ENTITY hello71 "&hello70; &hello70;">
+ <!ENTITY hello72 "&hello71; &hello71;">
+ <!ENTITY hello73 "&hello72; &hello72;">
+ <!ENTITY hello74 "&hello73; &hello73;">
+ <!ENTITY hello75 "&hello74; &hello74;">
+ <!ENTITY hello76 "&hello75; &hello75;">
+ <!ENTITY hello77 "&hello76; &hello76;">
+ <!ENTITY hello78 "&hello77; &hello77;">
+ <!ENTITY hello79 "&hello78; &hello78;">
+ <!ENTITY hello80 "&hello79; &hello79;">
+
+ <!ENTITY hello81 "&hello80; &hello80;">
+ <!ENTITY hello82 "&hello81; &hello81;">
+ <!ENTITY hello83 "&hello82; &hello82;">
+ <!ENTITY hello84 "&hello83; &hello83;">
+ <!ENTITY hello85 "&hello84; &hello84;">
+ <!ENTITY hello86 "&hello85; &hello85;">
+ <!ENTITY hello87 "&hello86; &hello86;">
+ <!ENTITY hello88 "&hello87; &hello87;">
+ <!ENTITY hello89 "&hello88; &hello88;">
+ <!ENTITY hello90 "&hello89; &hello89;">
+
+ <!ENTITY hello91 "&hello90; &hello90;">
+ <!ENTITY hello92 "&hello91; &hello91;">
+ <!ENTITY hello93 "&hello92; &hello92;">
+ <!ENTITY hello94 "&hello93; &hello93;">
+ <!ENTITY hello95 "&hello94; &hello94;">
+ <!ENTITY hello96 "&hello95; &hello95;">
+ <!ENTITY hello97 "&hello96; &hello96;">
+ <!ENTITY hello98 "&hello97; &hello97;">
+ <!ENTITY hello99 "&hello98; &hello98;">
+ <!ENTITY hello100 "&hello99; &hello99;">
+
+ <!ENTITY hello101 "&hello100; &hello100;">
+ <!ENTITY hello102 "&hello101; &hello101;">
+ <!ENTITY hello103 "&hello102; &hello102;">
+ <!ENTITY hello104 "&hello103; &hello103;">
+ <!ENTITY hello105 "&hello104; &hello104;">
+ <!ENTITY hello106 "&hello105; &hello105;">
+ <!ENTITY hello107 "&hello106; &hello106;">
+ <!ENTITY hello108 "&hello107; &hello107;">
+ <!ENTITY hello109 "&hello108; &hello108;">
+ <!ENTITY hello110 "&hello109; &hello109;">
+
+ <!ENTITY hello111 "&hello110; &hello110;">
+ <!ENTITY hello112 "&hello111; &hello111;">
+ <!ENTITY hello113 "&hello112; &hello112;">
+ <!ENTITY hello114 "&hello113; &hello113;">
+ <!ENTITY hello115 "&hello114; &hello114;">
+ <!ENTITY hello116 "&hello115; &hello115;">
+ <!ENTITY hello117 "&hello116; &hello116;">
+ <!ENTITY hello118 "&hello117; &hello117;">
+ <!ENTITY hello119 "&hello118; &hello118;">
+ <!ENTITY hello120 "&hello119; &hello119;">
+
+ <!ENTITY hello121 "&hello120; &hello120;">
+ <!ENTITY hello122 "&hello121; &hello121;">
+ <!ENTITY hello123 "&hello122; &hello122;">
+ <!ENTITY hello124 "&hello123; &hello123;">
+ <!ENTITY hello125 "&hello124; &hello124;">
+ <!ENTITY hello126 "&hello125; &hello125;">
+ <!ENTITY hello127 "&hello126; &hello126;">
+ <!ENTITY hello128 "&hello127; &hello127;">
+]>
+<definitions name="EndpointService" targetNamespace="http://jbws1582.jaxws.ws.test.jboss.org/" xmlns:tns="http://jbws1582.jaxws.ws.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ </types>
+ <message name="Endpoint_echoString">
+ <part name="arg0" type="xsd:string">
+ </part>
+ </message>
+ <message name="Endpoint_echoStringResponse">
+ <part name="return" type="xsd:string">
+ </part>
+ </message>
+ <portType name="Endpoint">
+ <operation name="echoString" parameterOrder="arg0">
+ <input message="tns:Endpoint_echoString">
+ </input>
+ <output message="tns:Endpoint_echoStringResponse">
+ </output>
+ </operation>
+ </portType>
+ <binding name="EndpointBinding" type="tns:Endpoint">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="echoString">
+ <soap:operation soapAction="urn:EchoString"/>
+ <input>
+ <soap:body use="literal" namespace="http://jbws1582.jaxws.ws.test.jboss.org/"/>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://jbws1582.jaxws.ws.test.jboss.org/"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="EndpointService">
+ <port name="EndpointPort" binding="tns:EndpointBinding">
+ <soap:address location="&hello128;"/>
+ </port>
+ </service>
+</definitions>
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/service.wsdl
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/service.wsdl (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/service.wsdl 2009-04-29 10:27:16 UTC (rev 9919)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="EndpointService" targetNamespace="http://jbws1582.jaxws.ws.test.jboss.org/" xmlns:tns="http://jbws1582.jaxws.ws.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ </types>
+ <message name="Endpoint_echoString">
+ <part name="arg0" type="xsd:string">
+ </part>
+ </message>
+ <message name="Endpoint_echoStringResponse">
+ <part name="return" type="xsd:string">
+ </part>
+ </message>
+ <portType name="Endpoint">
+ <operation name="echoString" parameterOrder="arg0">
+ <input message="tns:Endpoint_echoString">
+ </input>
+ <output message="tns:Endpoint_echoStringResponse">
+ </output>
+ </operation>
+ </portType>
+ <binding name="EndpointBinding" type="tns:Endpoint">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="echoString">
+ <soap:operation soapAction="urn:EchoString"/>
+ <input>
+ <soap:body use="literal" namespace="http://jbws1582.jaxws.ws.test.jboss.org/"/>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://jbws1582.jaxws.ws.test.jboss.org/"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="EndpointService">
+ <port name="EndpointPort" binding="tns:EndpointBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/attack-message.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/attack-message.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/attack-message.xml 2009-04-29 10:27:16 UTC (rev 9919)
@@ -0,0 +1,151 @@
+<?xml version="1.0"?>
+<!DOCTYPE root [
+ <!ENTITY hello1 "Hello">
+ <!ENTITY hello2 "&hello1; &hello1;">
+ <!ENTITY hello3 "&hello2; &hello2;">
+ <!ENTITY hello4 "&hello3; &hello3;">
+ <!ENTITY hello5 "&hello4; &hello4;">
+ <!ENTITY hello6 "&hello5; &hello5;">
+ <!ENTITY hello7 "&hello6; &hello6;">
+ <!ENTITY hello8 "&hello7; &hello7;">
+ <!ENTITY hello9 "&hello8; &hello8;">
+ <!ENTITY hello10 "&hello9; &hello9;">
+
+ <!ENTITY hello11 "&hello10; &hello10;">
+ <!ENTITY hello12 "&hello11; &hello11;">
+ <!ENTITY hello13 "&hello12; &hello12;">
+ <!ENTITY hello14 "&hello13; &hello13;">
+ <!ENTITY hello15 "&hello14; &hello14;">
+ <!ENTITY hello16 "&hello15; &hello15;">
+ <!ENTITY hello17 "&hello16; &hello16;">
+ <!ENTITY hello18 "&hello17; &hello17;">
+ <!ENTITY hello19 "&hello18; &hello18;">
+ <!ENTITY hello20 "&hello19; &hello19;">
+
+ <!ENTITY hello21 "&hello20; &hello20;">
+ <!ENTITY hello22 "&hello21; &hello21;">
+ <!ENTITY hello23 "&hello22; &hello22;">
+ <!ENTITY hello24 "&hello23; &hello23;">
+ <!ENTITY hello25 "&hello24; &hello24;">
+ <!ENTITY hello26 "&hello25; &hello25;">
+ <!ENTITY hello27 "&hello26; &hello26;">
+ <!ENTITY hello28 "&hello27; &hello27;">
+ <!ENTITY hello29 "&hello28; &hello28;">
+ <!ENTITY hello30 "&hello29; &hello29;">
+
+ <!ENTITY hello31 "&hello30; &hello30;">
+ <!ENTITY hello32 "&hello31; &hello31;">
+ <!ENTITY hello33 "&hello32; &hello32;">
+ <!ENTITY hello34 "&hello33; &hello33;">
+ <!ENTITY hello35 "&hello34; &hello34;">
+ <!ENTITY hello36 "&hello35; &hello35;">
+ <!ENTITY hello37 "&hello36; &hello36;">
+ <!ENTITY hello38 "&hello37; &hello37;">
+ <!ENTITY hello39 "&hello38; &hello38;">
+ <!ENTITY hello40 "&hello39; &hello39;">
+
+ <!ENTITY hello41 "&hello40; &hello40;">
+ <!ENTITY hello42 "&hello41; &hello41;">
+ <!ENTITY hello43 "&hello42; &hello42;">
+ <!ENTITY hello44 "&hello43; &hello43;">
+ <!ENTITY hello45 "&hello44; &hello44;">
+ <!ENTITY hello46 "&hello45; &hello45;">
+ <!ENTITY hello47 "&hello46; &hello46;">
+ <!ENTITY hello48 "&hello47; &hello47;">
+ <!ENTITY hello49 "&hello48; &hello48;">
+ <!ENTITY hello50 "&hello49; &hello49;">
+
+ <!ENTITY hello51 "&hello50; &hello50;">
+ <!ENTITY hello52 "&hello51; &hello51;">
+ <!ENTITY hello53 "&hello52; &hello52;">
+ <!ENTITY hello54 "&hello53; &hello53;">
+ <!ENTITY hello55 "&hello54; &hello54;">
+ <!ENTITY hello56 "&hello55; &hello55;">
+ <!ENTITY hello57 "&hello56; &hello56;">
+ <!ENTITY hello58 "&hello57; &hello57;">
+ <!ENTITY hello59 "&hello58; &hello58;">
+ <!ENTITY hello60 "&hello59; &hello59;">
+
+ <!ENTITY hello61 "&hello60; &hello60;">
+ <!ENTITY hello62 "&hello61; &hello61;">
+ <!ENTITY hello63 "&hello62; &hello62;">
+ <!ENTITY hello64 "&hello63; &hello63;">
+ <!ENTITY hello65 "&hello64; &hello64;">
+ <!ENTITY hello66 "&hello65; &hello65;">
+ <!ENTITY hello67 "&hello66; &hello66;">
+ <!ENTITY hello68 "&hello67; &hello67;">
+ <!ENTITY hello69 "&hello68; &hello68;">
+ <!ENTITY hello70 "&hello69; &hello69;">
+
+ <!ENTITY hello71 "&hello70; &hello70;">
+ <!ENTITY hello72 "&hello71; &hello71;">
+ <!ENTITY hello73 "&hello72; &hello72;">
+ <!ENTITY hello74 "&hello73; &hello73;">
+ <!ENTITY hello75 "&hello74; &hello74;">
+ <!ENTITY hello76 "&hello75; &hello75;">
+ <!ENTITY hello77 "&hello76; &hello76;">
+ <!ENTITY hello78 "&hello77; &hello77;">
+ <!ENTITY hello79 "&hello78; &hello78;">
+ <!ENTITY hello80 "&hello79; &hello79;">
+
+ <!ENTITY hello81 "&hello80; &hello80;">
+ <!ENTITY hello82 "&hello81; &hello81;">
+ <!ENTITY hello83 "&hello82; &hello82;">
+ <!ENTITY hello84 "&hello83; &hello83;">
+ <!ENTITY hello85 "&hello84; &hello84;">
+ <!ENTITY hello86 "&hello85; &hello85;">
+ <!ENTITY hello87 "&hello86; &hello86;">
+ <!ENTITY hello88 "&hello87; &hello87;">
+ <!ENTITY hello89 "&hello88; &hello88;">
+ <!ENTITY hello90 "&hello89; &hello89;">
+
+ <!ENTITY hello91 "&hello90; &hello90;">
+ <!ENTITY hello92 "&hello91; &hello91;">
+ <!ENTITY hello93 "&hello92; &hello92;">
+ <!ENTITY hello94 "&hello93; &hello93;">
+ <!ENTITY hello95 "&hello94; &hello94;">
+ <!ENTITY hello96 "&hello95; &hello95;">
+ <!ENTITY hello97 "&hello96; &hello96;">
+ <!ENTITY hello98 "&hello97; &hello97;">
+ <!ENTITY hello99 "&hello98; &hello98;">
+ <!ENTITY hello100 "&hello99; &hello99;">
+
+ <!ENTITY hello101 "&hello100; &hello100;">
+ <!ENTITY hello102 "&hello101; &hello101;">
+ <!ENTITY hello103 "&hello102; &hello102;">
+ <!ENTITY hello104 "&hello103; &hello103;">
+ <!ENTITY hello105 "&hello104; &hello104;">
+ <!ENTITY hello106 "&hello105; &hello105;">
+ <!ENTITY hello107 "&hello106; &hello106;">
+ <!ENTITY hello108 "&hello107; &hello107;">
+ <!ENTITY hello109 "&hello108; &hello108;">
+ <!ENTITY hello110 "&hello109; &hello109;">
+
+ <!ENTITY hello111 "&hello110; &hello110;">
+ <!ENTITY hello112 "&hello111; &hello111;">
+ <!ENTITY hello113 "&hello112; &hello112;">
+ <!ENTITY hello114 "&hello113; &hello113;">
+ <!ENTITY hello115 "&hello114; &hello114;">
+ <!ENTITY hello116 "&hello115; &hello115;">
+ <!ENTITY hello117 "&hello116; &hello116;">
+ <!ENTITY hello118 "&hello117; &hello117;">
+ <!ENTITY hello119 "&hello118; &hello118;">
+ <!ENTITY hello120 "&hello119; &hello119;">
+
+ <!ENTITY hello121 "&hello120; &hello120;">
+ <!ENTITY hello122 "&hello121; &hello121;">
+ <!ENTITY hello123 "&hello122; &hello122;">
+ <!ENTITY hello124 "&hello123; &hello123;">
+ <!ENTITY hello125 "&hello124; &hello124;">
+ <!ENTITY hello126 "&hello125; &hello125;">
+ <!ENTITY hello127 "&hello126; &hello126;">
+ <!ENTITY hello128 "&hello127; &hello127;">
+]>
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
+ <env:Header/>
+ <env:Body>
+ <ns1:echoString xmlns:ns1='http://jbws1582.jaxws.ws.test.jboss.org/'>
+ <arg0>&hello128;</arg0>
+ </ns1:echoString>
+ </env:Body>
+</env:Envelope>
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/message.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/message.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/src/test/resources/jaxws/jbws1582/message.xml 2009-04-29 10:27:16 UTC (rev 9919)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
+ <env:Header/>
+ <env:Body>
+ <ns1:echoString xmlns:ns1='http://jbws1582.jaxws.ws.test.jboss.org/'>
+ <arg0>Hello</arg0>
+ </ns1:echoString>
+ </env:Body>
+</env:Envelope>
+
15 years, 8 months
- 1
- 0
JBossWS SVN: r9918 - common/branches/jbossws-common-1.0.0.GA_CP03_JBPAPP-1961/src/main/java/org/jboss/wsf/common.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-29 06:25:44 -0400 (Wed, 29 Apr 2009)
New Revision: 9918
Modified:
common/branches/jbossws-common-1.0.0.GA_CP03_JBPAPP-1961/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBWS-1582][JBPAPP-1961] backport
Modified: common/branches/jbossws-common-1.0.0.GA_CP03_JBPAPP-1961/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/branches/jbossws-common-1.0.0.GA_CP03_JBPAPP-1961/src/main/java/org/jboss/wsf/common/DOMUtils.java 2009-04-29 06:50:03 UTC (rev 9917)
+++ common/branches/jbossws-common-1.0.0.GA_CP03_JBPAPP-1961/src/main/java/org/jboss/wsf/common/DOMUtils.java 2009-04-29 10:25:44 UTC (rev 9918)
@@ -33,6 +33,7 @@
import java.util.Iterator;
import java.util.Map;
+import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -69,6 +70,7 @@
private static Logger log = Logger.getLogger(DOMUtils.class);
private static final String DISABLE_DEFERRED_NODE_EXPANSION = "org.jboss.ws.disable_deferred_node_expansion";
+ private static final String DEFER_NODE_EXPANSION_FEATURE = "http://apache.org/xml/features/dom/defer-node-expansion";
// All elements created by the same thread are created by the same builder and belong to the same doc
private static ThreadLocal<Document> documentThreadLocal = new ThreadLocal<Document>();
@@ -81,11 +83,18 @@
factory.setValidating(false);
factory.setNamespaceAware(true);
- boolean disableDeferredNodeExpansion = Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION);
- if (disableDeferredNodeExpansion == true)
+ try
{
- factory.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false);
+ factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ if (Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION))
+ {
+ factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false);
+ }
}
+ catch (ParserConfigurationException pce)
+ {
+ log.error(pce);
+ }
DocumentBuilder builder = factory.newDocumentBuilder();
setEntityResolver(builder);
15 years, 8 months
- 1
- 0
JBossWS SVN: r9917 - common/trunk/src/main/java/org/jboss/wsf/common.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-29 02:50:03 -0400 (Wed, 29 Apr 2009)
New Revision: 9917
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBWS-1582] removing unused constant
Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2009-04-29 06:43:33 UTC (rev 9916)
+++ common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2009-04-29 06:50:03 UTC (rev 9917)
@@ -71,7 +71,6 @@
private static final String DISABLE_DEFERRED_NODE_EXPANSION = "org.jboss.ws.disable_deferred_node_expansion";
private static final String DEFER_NODE_EXPANSION_FEATURE = "http://apache.org/xml/features/dom/defer-node-expansion";
- private static final String DISALLOW_DOCTYPE_DECL_FEATURE = "http://apache.org/xml/features/disallow-doctype-decl";
// All elements created by the same thread are created by the same builder and belong to the same doc
private static ThreadLocal<Document> documentThreadLocal = new ThreadLocal<Document>();
15 years, 8 months
- 1
- 0
JBossWS SVN: r9916 - common/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-29 02:43:33 -0400 (Wed, 29 Apr 2009)
New Revision: 9916
Added:
common/branches/jbossws-common-1.0.0.GA_CP03_JBPAPP-1961/
Log:
[JBPAPP-1961] creating user branch
Copied: common/branches/jbossws-common-1.0.0.GA_CP03_JBPAPP-1961 (from rev 9915, common/branches/jbossws-common-1.0.0.GA_CP)
15 years, 8 months
- 1
- 0
JBossWS SVN: r9915 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-29 02:38:14 -0400 (Wed, 29 Apr 2009)
New Revision: 9915
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961/
Log:
[JBPAPP-1961] creating patch branch
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1961 (from rev 9914, stack/native/branches/jbossws-native-2.0.1.SP2_CP)
15 years, 8 months
- 1
- 0
JBossWS SVN: r9914 - in stack/native/trunk/modules/testsuite/native-tests/src/test: resources/jaxws/jbws1582 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-29 01:57:38 -0400 (Wed, 29 Apr 2009)
New Revision: 9914
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/attack-message.xml
Log:
[JBWS-1582] finalizing test
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2009-04-29 05:36:33 UTC (rev 9913)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2009-04-29 05:57:38 UTC (rev 9914)
@@ -77,7 +77,8 @@
{
String response = getResponse("jaxws/jbws1582/attack-message.xml");
assertTrue(response.contains("HTTP/1.1 500"));
- assertTrue(response.contains("DOCTYPE is disallowed when the feature"));
+ assertTrue(response.contains("The parser has encountered more than"));
+ assertTrue(response.contains("entity expansions in this document"));
}
private String getResponse(String requestFile) throws Exception
@@ -117,6 +118,10 @@
e.printStackTrace();
log.warn(e.getMessage(), e);
}
+ finally
+ {
+ this.undeploy("jaxws-jbws1582-attacked.war");
+ }
}
private static String getContent(InputStream is) throws IOException
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/attack-message.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/attack-message.xml 2009-04-29 05:36:33 UTC (rev 9913)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/attack-message.xml 2009-04-29 05:57:38 UTC (rev 9914)
@@ -145,7 +145,7 @@
<env:Header/>
<env:Body>
<ns1:echoString xmlns:ns1='http://jbws1582.jaxws.ws.test.jboss.org/'>
- <arg0>&hello12;</arg0>
+ <arg0>&hello128;</arg0>
</ns1:echoString>
</env:Body>
</env:Envelope>
15 years, 8 months
- 1
- 0
JBossWS SVN: r9913 - in stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582: WEB-INF/wsdl and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-29 01:36:33 -0400 (Wed, 29 Apr 2009)
New Revision: 9913
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/attack-message.xml
Log:
[JBWS-1582] fix attack xml files
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl 2009-04-29 05:02:29 UTC (rev 9912)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl 2009-04-29 05:36:33 UTC (rev 9913)
@@ -1,145 +1,145 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE definitions [
- <!ENTITY ha1 "Hello">
- <!ENTITY ha2 "&ha1; &ha1;">
- <!ENTITY ha3 "&ha2; &ha2;">
- <!ENTITY ha4 "&ha3; &ha3;">
- <!ENTITY ha5 "&ha4; &ha4;">
- <!ENTITY ha6 "&ha5; &ha5;">
- <!ENTITY ha7 "&ha6; &ha6;">
- <!ENTITY ha8 "&ha7; &ha7;">
- <!ENTITY ha9 "&ha8; &ha8;">
- <!ENTITY ha10 "&ha9; &ha9;">
+ <!ENTITY hello1 "Hello">
+ <!ENTITY hello2 "&hello1; &hello1;">
+ <!ENTITY hello3 "&hello2; &hello2;">
+ <!ENTITY hello4 "&hello3; &hello3;">
+ <!ENTITY hello5 "&hello4; &hello4;">
+ <!ENTITY hello6 "&hello5; &hello5;">
+ <!ENTITY hello7 "&hello6; &hello6;">
+ <!ENTITY hello8 "&hello7; &hello7;">
+ <!ENTITY hello9 "&hello8; &hello8;">
+ <!ENTITY hello10 "&hello9; &hello9;">
- <!ENTITY ha11 "&ha10; &ha10;">
- <!ENTITY ha12 "&ha11; &ha11;">
- <!ENTITY ha13 "&ha12; &ha12;">
- <!ENTITY ha14 "&ha13; &ha13;">
- <!ENTITY ha15 "&ha14; &ha14;">
- <!ENTITY ha16 "&ha15; &ha15;">
- <!ENTITY ha17 "&ha16; &ha16;">
- <!ENTITY ha18 "&ha17; &ha17;">
- <!ENTITY ha19 "&ha18; &ha18;">
- <!ENTITY ha20 "&ha19; &ha19;">
+ <!ENTITY hello11 "&hello10; &hello10;">
+ <!ENTITY hello12 "&hello11; &hello11;">
+ <!ENTITY hello13 "&hello12; &hello12;">
+ <!ENTITY hello14 "&hello13; &hello13;">
+ <!ENTITY hello15 "&hello14; &hello14;">
+ <!ENTITY hello16 "&hello15; &hello15;">
+ <!ENTITY hello17 "&hello16; &hello16;">
+ <!ENTITY hello18 "&hello17; &hello17;">
+ <!ENTITY hello19 "&hello18; &hello18;">
+ <!ENTITY hello20 "&hello19; &hello19;">
- <!ENTITY ha21 "&ha20; &ha20;">
- <!ENTITY ha22 "&ha21; &ha21;">
- <!ENTITY ha23 "&ha22; &ha22;">
- <!ENTITY ha24 "&ha23; &ha23;">
- <!ENTITY ha25 "&ha24; &ha24;">
- <!ENTITY ha26 "&ha25; &ha25;">
- <!ENTITY ha27 "&ha26; &ha26;">
- <!ENTITY ha28 "&ha27; &ha27;">
- <!ENTITY ha29 "&ha28; &ha28;">
- <!ENTITY ha30 "&ha29; &ha29;">
+ <!ENTITY hello21 "&hello20; &hello20;">
+ <!ENTITY hello22 "&hello21; &hello21;">
+ <!ENTITY hello23 "&hello22; &hello22;">
+ <!ENTITY hello24 "&hello23; &hello23;">
+ <!ENTITY hello25 "&hello24; &hello24;">
+ <!ENTITY hello26 "&hello25; &hello25;">
+ <!ENTITY hello27 "&hello26; &hello26;">
+ <!ENTITY hello28 "&hello27; &hello27;">
+ <!ENTITY hello29 "&hello28; &hello28;">
+ <!ENTITY hello30 "&hello29; &hello29;">
- <!ENTITY ha31 "&ha30; &ha30;">
- <!ENTITY ha32 "&ha31; &ha31;">
- <!ENTITY ha33 "&ha32; &ha32;">
- <!ENTITY ha34 "&ha33; &ha33;">
- <!ENTITY ha35 "&ha34; &ha34;">
- <!ENTITY ha36 "&ha35; &ha35;">
- <!ENTITY ha37 "&ha36; &ha36;">
- <!ENTITY ha38 "&ha37; &ha37;">
- <!ENTITY ha39 "&ha38; &ha38;">
- <!ENTITY ha40 "&ha39; &ha39;">
+ <!ENTITY hello31 "&hello30; &hello30;">
+ <!ENTITY hello32 "&hello31; &hello31;">
+ <!ENTITY hello33 "&hello32; &hello32;">
+ <!ENTITY hello34 "&hello33; &hello33;">
+ <!ENTITY hello35 "&hello34; &hello34;">
+ <!ENTITY hello36 "&hello35; &hello35;">
+ <!ENTITY hello37 "&hello36; &hello36;">
+ <!ENTITY hello38 "&hello37; &hello37;">
+ <!ENTITY hello39 "&hello38; &hello38;">
+ <!ENTITY hello40 "&hello39; &hello39;">
- <!ENTITY ha41 "&ha40; &ha40;">
- <!ENTITY ha42 "&ha41; &ha41;">
- <!ENTITY ha43 "&ha42; &ha42;">
- <!ENTITY ha44 "&ha43; &ha43;">
- <!ENTITY ha45 "&ha44; &ha44;">
- <!ENTITY ha46 "&ha45; &ha45;">
- <!ENTITY ha47 "&ha46; &ha46;">
- <!ENTITY ha48 "&ha47; &ha47;">
- <!ENTITY ha49 "&ha48; &ha48;">
- <!ENTITY ha50 "&ha49; &ha49;">
+ <!ENTITY hello41 "&hello40; &hello40;">
+ <!ENTITY hello42 "&hello41; &hello41;">
+ <!ENTITY hello43 "&hello42; &hello42;">
+ <!ENTITY hello44 "&hello43; &hello43;">
+ <!ENTITY hello45 "&hello44; &hello44;">
+ <!ENTITY hello46 "&hello45; &hello45;">
+ <!ENTITY hello47 "&hello46; &hello46;">
+ <!ENTITY hello48 "&hello47; &hello47;">
+ <!ENTITY hello49 "&hello48; &hello48;">
+ <!ENTITY hello50 "&hello49; &hello49;">
- <!ENTITY ha51 "&ha50; &ha50;">
- <!ENTITY ha52 "&ha51; &ha51;">
- <!ENTITY ha53 "&ha52; &ha52;">
- <!ENTITY ha54 "&ha53; &ha53;">
- <!ENTITY ha55 "&ha54; &ha54;">
- <!ENTITY ha56 "&ha55; &ha55;">
- <!ENTITY ha57 "&ha56; &ha56;">
- <!ENTITY ha58 "&ha57; &ha57;">
- <!ENTITY ha59 "&ha58; &ha58;">
- <!ENTITY ha60 "&ha59; &ha59;">
+ <!ENTITY hello51 "&hello50; &hello50;">
+ <!ENTITY hello52 "&hello51; &hello51;">
+ <!ENTITY hello53 "&hello52; &hello52;">
+ <!ENTITY hello54 "&hello53; &hello53;">
+ <!ENTITY hello55 "&hello54; &hello54;">
+ <!ENTITY hello56 "&hello55; &hello55;">
+ <!ENTITY hello57 "&hello56; &hello56;">
+ <!ENTITY hello58 "&hello57; &hello57;">
+ <!ENTITY hello59 "&hello58; &hello58;">
+ <!ENTITY hello60 "&hello59; &hello59;">
- <!ENTITY ha61 "&ha60; &ha60;">
- <!ENTITY ha62 "&ha61; &ha61;">
- <!ENTITY ha63 "&ha62; &ha62;">
- <!ENTITY ha64 "&ha63; &ha63;">
- <!ENTITY ha65 "&ha64; &ha64;">
- <!ENTITY ha66 "&ha65; &ha65;">
- <!ENTITY ha67 "&ha66; &ha66;">
- <!ENTITY ha68 "&ha67; &ha67;">
- <!ENTITY ha69 "&ha68; &ha68;">
- <!ENTITY ha70 "&ha69; &ha69;">
+ <!ENTITY hello61 "&hello60; &hello60;">
+ <!ENTITY hello62 "&hello61; &hello61;">
+ <!ENTITY hello63 "&hello62; &hello62;">
+ <!ENTITY hello64 "&hello63; &hello63;">
+ <!ENTITY hello65 "&hello64; &hello64;">
+ <!ENTITY hello66 "&hello65; &hello65;">
+ <!ENTITY hello67 "&hello66; &hello66;">
+ <!ENTITY hello68 "&hello67; &hello67;">
+ <!ENTITY hello69 "&hello68; &hello68;">
+ <!ENTITY hello70 "&hello69; &hello69;">
- <!ENTITY ha71 "&ha70; &ha70;">
- <!ENTITY ha72 "&ha71; &ha71;">
- <!ENTITY ha73 "&ha72; &ha72;">
- <!ENTITY ha74 "&ha73; &ha73;">
- <!ENTITY ha75 "&ha74; &ha74;">
- <!ENTITY ha76 "&ha75; &ha75;">
- <!ENTITY ha77 "&ha76; &ha76;">
- <!ENTITY ha78 "&ha77; &ha77;">
- <!ENTITY ha79 "&ha78; &ha78;">
- <!ENTITY ha80 "&ha79; &ha79;">
+ <!ENTITY hello71 "&hello70; &hello70;">
+ <!ENTITY hello72 "&hello71; &hello71;">
+ <!ENTITY hello73 "&hello72; &hello72;">
+ <!ENTITY hello74 "&hello73; &hello73;">
+ <!ENTITY hello75 "&hello74; &hello74;">
+ <!ENTITY hello76 "&hello75; &hello75;">
+ <!ENTITY hello77 "&hello76; &hello76;">
+ <!ENTITY hello78 "&hello77; &hello77;">
+ <!ENTITY hello79 "&hello78; &hello78;">
+ <!ENTITY hello80 "&hello79; &hello79;">
- <!ENTITY ha81 "&ha80; &ha80;">
- <!ENTITY ha82 "&ha81; &ha81;">
- <!ENTITY ha83 "&ha82; &ha82;">
- <!ENTITY ha84 "&ha83; &ha83;">
- <!ENTITY ha85 "&ha84; &ha84;">
- <!ENTITY ha86 "&ha85; &ha85;">
- <!ENTITY ha87 "&ha86; &ha86;">
- <!ENTITY ha88 "&ha87; &ha87;">
- <!ENTITY ha89 "&ha88; &ha88;">
- <!ENTITY ha90 "&ha89; &ha89;">
+ <!ENTITY hello81 "&hello80; &hello80;">
+ <!ENTITY hello82 "&hello81; &hello81;">
+ <!ENTITY hello83 "&hello82; &hello82;">
+ <!ENTITY hello84 "&hello83; &hello83;">
+ <!ENTITY hello85 "&hello84; &hello84;">
+ <!ENTITY hello86 "&hello85; &hello85;">
+ <!ENTITY hello87 "&hello86; &hello86;">
+ <!ENTITY hello88 "&hello87; &hello87;">
+ <!ENTITY hello89 "&hello88; &hello88;">
+ <!ENTITY hello90 "&hello89; &hello89;">
- <!ENTITY ha91 "&ha90; &ha90;">
- <!ENTITY ha92 "&ha91; &ha91;">
- <!ENTITY ha93 "&ha92; &ha92;">
- <!ENTITY ha94 "&ha93; &ha93;">
- <!ENTITY ha95 "&ha94; &ha94;">
- <!ENTITY ha96 "&ha95; &ha95;">
- <!ENTITY ha97 "&ha96; &ha96;">
- <!ENTITY ha98 "&ha97; &ha97;">
- <!ENTITY ha99 "&ha98; &ha98;">
- <!ENTITY ha100 "&ha99; &ha99;">
+ <!ENTITY hello91 "&hello90; &hello90;">
+ <!ENTITY hello92 "&hello91; &hello91;">
+ <!ENTITY hello93 "&hello92; &hello92;">
+ <!ENTITY hello94 "&hello93; &hello93;">
+ <!ENTITY hello95 "&hello94; &hello94;">
+ <!ENTITY hello96 "&hello95; &hello95;">
+ <!ENTITY hello97 "&hello96; &hello96;">
+ <!ENTITY hello98 "&hello97; &hello97;">
+ <!ENTITY hello99 "&hello98; &hello98;">
+ <!ENTITY hello100 "&hello99; &hello99;">
- <!ENTITY ha101 "&ha100; &ha100;">
- <!ENTITY ha102 "&ha101; &ha101;">
- <!ENTITY ha103 "&ha102; &ha102;">
- <!ENTITY ha104 "&ha103; &ha103;">
- <!ENTITY ha105 "&ha104; &ha104;">
- <!ENTITY ha106 "&ha105; &ha105;">
- <!ENTITY ha107 "&ha106; &ha106;">
- <!ENTITY ha108 "&ha107; &ha107;">
- <!ENTITY ha109 "&ha108; &ha108;">
- <!ENTITY ha110 "&ha109; &ha109;">
+ <!ENTITY hello101 "&hello100; &hello100;">
+ <!ENTITY hello102 "&hello101; &hello101;">
+ <!ENTITY hello103 "&hello102; &hello102;">
+ <!ENTITY hello104 "&hello103; &hello103;">
+ <!ENTITY hello105 "&hello104; &hello104;">
+ <!ENTITY hello106 "&hello105; &hello105;">
+ <!ENTITY hello107 "&hello106; &hello106;">
+ <!ENTITY hello108 "&hello107; &hello107;">
+ <!ENTITY hello109 "&hello108; &hello108;">
+ <!ENTITY hello110 "&hello109; &hello109;">
- <!ENTITY ha111 "&ha110; &ha110;">
- <!ENTITY ha112 "&ha111; &ha111;">
- <!ENTITY ha113 "&ha112; &ha112;">
- <!ENTITY ha114 "&ha113; &ha113;">
- <!ENTITY ha115 "&ha114; &ha114;">
- <!ENTITY ha116 "&ha115; &ha115;">
- <!ENTITY ha117 "&ha116; &ha116;">
- <!ENTITY ha118 "&ha117; &ha117;">
- <!ENTITY ha119 "&ha118; &ha118;">
- <!ENTITY ha120 "&ha119; &ha119;">
+ <!ENTITY hello111 "&hello110; &hello110;">
+ <!ENTITY hello112 "&hello111; &hello111;">
+ <!ENTITY hello113 "&hello112; &hello112;">
+ <!ENTITY hello114 "&hello113; &hello113;">
+ <!ENTITY hello115 "&hello114; &hello114;">
+ <!ENTITY hello116 "&hello115; &hello115;">
+ <!ENTITY hello117 "&hello116; &hello116;">
+ <!ENTITY hello118 "&hello117; &hello117;">
+ <!ENTITY hello119 "&hello118; &hello118;">
+ <!ENTITY hello120 "&hello119; &hello119;">
- <!ENTITY ha121 "&ha120; &ha120;">
- <!ENTITY ha122 "&ha121; &ha121;">
- <!ENTITY ha123 "&ha122; &ha122;">
- <!ENTITY ha124 "&ha123; &ha123;">
- <!ENTITY ha125 "&ha124; &ha124;">
- <!ENTITY ha126 "&ha125; &ha125;">
- <!ENTITY ha127 "&ha126; &ha126;">
- <!ENTITY ha128 "&ha127; &ha127;">
+ <!ENTITY hello121 "&hello120; &hello120;">
+ <!ENTITY hello122 "&hello121; &hello121;">
+ <!ENTITY hello123 "&hello122; &hello122;">
+ <!ENTITY hello124 "&hello123; &hello123;">
+ <!ENTITY hello125 "&hello124; &hello124;">
+ <!ENTITY hello126 "&hello125; &hello125;">
+ <!ENTITY hello127 "&hello126; &hello126;">
+ <!ENTITY hello128 "&hello127; &hello127;">
]>
<definitions name="EndpointService" targetNamespace="http://jbws1582.jaxws.ws.test.jboss.org/" xmlns:tns="http://jbws1582.jaxws.ws.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
<types>
@@ -174,7 +174,7 @@
</binding>
<service name="EndpointService">
<port name="EndpointPort" binding="tns:EndpointBinding">
- <soap:address location="&h12;"/>
+ <soap:address location="&hello128;"/>
</port>
</service>
</definitions>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/attack-message.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/attack-message.xml 2009-04-29 05:02:29 UTC (rev 9912)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/attack-message.xml 2009-04-29 05:36:33 UTC (rev 9913)
@@ -1,151 +1,151 @@
<?xml version="1.0"?>
<!DOCTYPE root [
- <!ENTITY ha1 "Hello">
- <!ENTITY ha2 "&ha1; &ha1;">
- <!ENTITY ha3 "&ha2; &ha2;">
- <!ENTITY ha4 "&ha3; &ha3;">
- <!ENTITY ha5 "&ha4; &ha4;">
- <!ENTITY ha6 "&ha5; &ha5;">
- <!ENTITY ha7 "&ha6; &ha6;">
- <!ENTITY ha8 "&ha7; &ha7;">
- <!ENTITY ha9 "&ha8; &ha8;">
- <!ENTITY ha10 "&ha9; &ha9;">
+ <!ENTITY hello1 "Hello">
+ <!ENTITY hello2 "&hello1; &hello1;">
+ <!ENTITY hello3 "&hello2; &hello2;">
+ <!ENTITY hello4 "&hello3; &hello3;">
+ <!ENTITY hello5 "&hello4; &hello4;">
+ <!ENTITY hello6 "&hello5; &hello5;">
+ <!ENTITY hello7 "&hello6; &hello6;">
+ <!ENTITY hello8 "&hello7; &hello7;">
+ <!ENTITY hello9 "&hello8; &hello8;">
+ <!ENTITY hello10 "&hello9; &hello9;">
- <!ENTITY ha11 "&ha10; &ha10;">
- <!ENTITY ha12 "&ha11; &ha11;">
- <!ENTITY ha13 "&ha12; &ha12;">
- <!ENTITY ha14 "&ha13; &ha13;">
- <!ENTITY ha15 "&ha14; &ha14;">
- <!ENTITY ha16 "&ha15; &ha15;">
- <!ENTITY ha17 "&ha16; &ha16;">
- <!ENTITY ha18 "&ha17; &ha17;">
- <!ENTITY ha19 "&ha18; &ha18;">
- <!ENTITY ha20 "&ha19; &ha19;">
+ <!ENTITY hello11 "&hello10; &hello10;">
+ <!ENTITY hello12 "&hello11; &hello11;">
+ <!ENTITY hello13 "&hello12; &hello12;">
+ <!ENTITY hello14 "&hello13; &hello13;">
+ <!ENTITY hello15 "&hello14; &hello14;">
+ <!ENTITY hello16 "&hello15; &hello15;">
+ <!ENTITY hello17 "&hello16; &hello16;">
+ <!ENTITY hello18 "&hello17; &hello17;">
+ <!ENTITY hello19 "&hello18; &hello18;">
+ <!ENTITY hello20 "&hello19; &hello19;">
- <!ENTITY ha21 "&ha20; &ha20;">
- <!ENTITY ha22 "&ha21; &ha21;">
- <!ENTITY ha23 "&ha22; &ha22;">
- <!ENTITY ha24 "&ha23; &ha23;">
- <!ENTITY ha25 "&ha24; &ha24;">
- <!ENTITY ha26 "&ha25; &ha25;">
- <!ENTITY ha27 "&ha26; &ha26;">
- <!ENTITY ha28 "&ha27; &ha27;">
- <!ENTITY ha29 "&ha28; &ha28;">
- <!ENTITY ha30 "&ha29; &ha29;">
+ <!ENTITY hello21 "&hello20; &hello20;">
+ <!ENTITY hello22 "&hello21; &hello21;">
+ <!ENTITY hello23 "&hello22; &hello22;">
+ <!ENTITY hello24 "&hello23; &hello23;">
+ <!ENTITY hello25 "&hello24; &hello24;">
+ <!ENTITY hello26 "&hello25; &hello25;">
+ <!ENTITY hello27 "&hello26; &hello26;">
+ <!ENTITY hello28 "&hello27; &hello27;">
+ <!ENTITY hello29 "&hello28; &hello28;">
+ <!ENTITY hello30 "&hello29; &hello29;">
- <!ENTITY ha31 "&ha30; &ha30;">
- <!ENTITY ha32 "&ha31; &ha31;">
- <!ENTITY ha33 "&ha32; &ha32;">
- <!ENTITY ha34 "&ha33; &ha33;">
- <!ENTITY ha35 "&ha34; &ha34;">
- <!ENTITY ha36 "&ha35; &ha35;">
- <!ENTITY ha37 "&ha36; &ha36;">
- <!ENTITY ha38 "&ha37; &ha37;">
- <!ENTITY ha39 "&ha38; &ha38;">
- <!ENTITY ha40 "&ha39; &ha39;">
+ <!ENTITY hello31 "&hello30; &hello30;">
+ <!ENTITY hello32 "&hello31; &hello31;">
+ <!ENTITY hello33 "&hello32; &hello32;">
+ <!ENTITY hello34 "&hello33; &hello33;">
+ <!ENTITY hello35 "&hello34; &hello34;">
+ <!ENTITY hello36 "&hello35; &hello35;">
+ <!ENTITY hello37 "&hello36; &hello36;">
+ <!ENTITY hello38 "&hello37; &hello37;">
+ <!ENTITY hello39 "&hello38; &hello38;">
+ <!ENTITY hello40 "&hello39; &hello39;">
- <!ENTITY ha41 "&ha40; &ha40;">
- <!ENTITY ha42 "&ha41; &ha41;">
- <!ENTITY ha43 "&ha42; &ha42;">
- <!ENTITY ha44 "&ha43; &ha43;">
- <!ENTITY ha45 "&ha44; &ha44;">
- <!ENTITY ha46 "&ha45; &ha45;">
- <!ENTITY ha47 "&ha46; &ha46;">
- <!ENTITY ha48 "&ha47; &ha47;">
- <!ENTITY ha49 "&ha48; &ha48;">
- <!ENTITY ha50 "&ha49; &ha49;">
+ <!ENTITY hello41 "&hello40; &hello40;">
+ <!ENTITY hello42 "&hello41; &hello41;">
+ <!ENTITY hello43 "&hello42; &hello42;">
+ <!ENTITY hello44 "&hello43; &hello43;">
+ <!ENTITY hello45 "&hello44; &hello44;">
+ <!ENTITY hello46 "&hello45; &hello45;">
+ <!ENTITY hello47 "&hello46; &hello46;">
+ <!ENTITY hello48 "&hello47; &hello47;">
+ <!ENTITY hello49 "&hello48; &hello48;">
+ <!ENTITY hello50 "&hello49; &hello49;">
- <!ENTITY ha51 "&ha50; &ha50;">
- <!ENTITY ha52 "&ha51; &ha51;">
- <!ENTITY ha53 "&ha52; &ha52;">
- <!ENTITY ha54 "&ha53; &ha53;">
- <!ENTITY ha55 "&ha54; &ha54;">
- <!ENTITY ha56 "&ha55; &ha55;">
- <!ENTITY ha57 "&ha56; &ha56;">
- <!ENTITY ha58 "&ha57; &ha57;">
- <!ENTITY ha59 "&ha58; &ha58;">
- <!ENTITY ha60 "&ha59; &ha59;">
+ <!ENTITY hello51 "&hello50; &hello50;">
+ <!ENTITY hello52 "&hello51; &hello51;">
+ <!ENTITY hello53 "&hello52; &hello52;">
+ <!ENTITY hello54 "&hello53; &hello53;">
+ <!ENTITY hello55 "&hello54; &hello54;">
+ <!ENTITY hello56 "&hello55; &hello55;">
+ <!ENTITY hello57 "&hello56; &hello56;">
+ <!ENTITY hello58 "&hello57; &hello57;">
+ <!ENTITY hello59 "&hello58; &hello58;">
+ <!ENTITY hello60 "&hello59; &hello59;">
- <!ENTITY ha61 "&ha60; &ha60;">
- <!ENTITY ha62 "&ha61; &ha61;">
- <!ENTITY ha63 "&ha62; &ha62;">
- <!ENTITY ha64 "&ha63; &ha63;">
- <!ENTITY ha65 "&ha64; &ha64;">
- <!ENTITY ha66 "&ha65; &ha65;">
- <!ENTITY ha67 "&ha66; &ha66;">
- <!ENTITY ha68 "&ha67; &ha67;">
- <!ENTITY ha69 "&ha68; &ha68;">
- <!ENTITY ha70 "&ha69; &ha69;">
+ <!ENTITY hello61 "&hello60; &hello60;">
+ <!ENTITY hello62 "&hello61; &hello61;">
+ <!ENTITY hello63 "&hello62; &hello62;">
+ <!ENTITY hello64 "&hello63; &hello63;">
+ <!ENTITY hello65 "&hello64; &hello64;">
+ <!ENTITY hello66 "&hello65; &hello65;">
+ <!ENTITY hello67 "&hello66; &hello66;">
+ <!ENTITY hello68 "&hello67; &hello67;">
+ <!ENTITY hello69 "&hello68; &hello68;">
+ <!ENTITY hello70 "&hello69; &hello69;">
- <!ENTITY ha71 "&ha70; &ha70;">
- <!ENTITY ha72 "&ha71; &ha71;">
- <!ENTITY ha73 "&ha72; &ha72;">
- <!ENTITY ha74 "&ha73; &ha73;">
- <!ENTITY ha75 "&ha74; &ha74;">
- <!ENTITY ha76 "&ha75; &ha75;">
- <!ENTITY ha77 "&ha76; &ha76;">
- <!ENTITY ha78 "&ha77; &ha77;">
- <!ENTITY ha79 "&ha78; &ha78;">
- <!ENTITY ha80 "&ha79; &ha79;">
+ <!ENTITY hello71 "&hello70; &hello70;">
+ <!ENTITY hello72 "&hello71; &hello71;">
+ <!ENTITY hello73 "&hello72; &hello72;">
+ <!ENTITY hello74 "&hello73; &hello73;">
+ <!ENTITY hello75 "&hello74; &hello74;">
+ <!ENTITY hello76 "&hello75; &hello75;">
+ <!ENTITY hello77 "&hello76; &hello76;">
+ <!ENTITY hello78 "&hello77; &hello77;">
+ <!ENTITY hello79 "&hello78; &hello78;">
+ <!ENTITY hello80 "&hello79; &hello79;">
- <!ENTITY ha81 "&ha80; &ha80;">
- <!ENTITY ha82 "&ha81; &ha81;">
- <!ENTITY ha83 "&ha82; &ha82;">
- <!ENTITY ha84 "&ha83; &ha83;">
- <!ENTITY ha85 "&ha84; &ha84;">
- <!ENTITY ha86 "&ha85; &ha85;">
- <!ENTITY ha87 "&ha86; &ha86;">
- <!ENTITY ha88 "&ha87; &ha87;">
- <!ENTITY ha89 "&ha88; &ha88;">
- <!ENTITY ha90 "&ha89; &ha89;">
+ <!ENTITY hello81 "&hello80; &hello80;">
+ <!ENTITY hello82 "&hello81; &hello81;">
+ <!ENTITY hello83 "&hello82; &hello82;">
+ <!ENTITY hello84 "&hello83; &hello83;">
+ <!ENTITY hello85 "&hello84; &hello84;">
+ <!ENTITY hello86 "&hello85; &hello85;">
+ <!ENTITY hello87 "&hello86; &hello86;">
+ <!ENTITY hello88 "&hello87; &hello87;">
+ <!ENTITY hello89 "&hello88; &hello88;">
+ <!ENTITY hello90 "&hello89; &hello89;">
- <!ENTITY ha91 "&ha90; &ha90;">
- <!ENTITY ha92 "&ha91; &ha91;">
- <!ENTITY ha93 "&ha92; &ha92;">
- <!ENTITY ha94 "&ha93; &ha93;">
- <!ENTITY ha95 "&ha94; &ha94;">
- <!ENTITY ha96 "&ha95; &ha95;">
- <!ENTITY ha97 "&ha96; &ha96;">
- <!ENTITY ha98 "&ha97; &ha97;">
- <!ENTITY ha99 "&ha98; &ha98;">
- <!ENTITY ha100 "&ha99; &ha99;">
+ <!ENTITY hello91 "&hello90; &hello90;">
+ <!ENTITY hello92 "&hello91; &hello91;">
+ <!ENTITY hello93 "&hello92; &hello92;">
+ <!ENTITY hello94 "&hello93; &hello93;">
+ <!ENTITY hello95 "&hello94; &hello94;">
+ <!ENTITY hello96 "&hello95; &hello95;">
+ <!ENTITY hello97 "&hello96; &hello96;">
+ <!ENTITY hello98 "&hello97; &hello97;">
+ <!ENTITY hello99 "&hello98; &hello98;">
+ <!ENTITY hello100 "&hello99; &hello99;">
- <!ENTITY ha101 "&ha100; &ha100;">
- <!ENTITY ha102 "&ha101; &ha101;">
- <!ENTITY ha103 "&ha102; &ha102;">
- <!ENTITY ha104 "&ha103; &ha103;">
- <!ENTITY ha105 "&ha104; &ha104;">
- <!ENTITY ha106 "&ha105; &ha105;">
- <!ENTITY ha107 "&ha106; &ha106;">
- <!ENTITY ha108 "&ha107; &ha107;">
- <!ENTITY ha109 "&ha108; &ha108;">
- <!ENTITY ha110 "&ha109; &ha109;">
+ <!ENTITY hello101 "&hello100; &hello100;">
+ <!ENTITY hello102 "&hello101; &hello101;">
+ <!ENTITY hello103 "&hello102; &hello102;">
+ <!ENTITY hello104 "&hello103; &hello103;">
+ <!ENTITY hello105 "&hello104; &hello104;">
+ <!ENTITY hello106 "&hello105; &hello105;">
+ <!ENTITY hello107 "&hello106; &hello106;">
+ <!ENTITY hello108 "&hello107; &hello107;">
+ <!ENTITY hello109 "&hello108; &hello108;">
+ <!ENTITY hello110 "&hello109; &hello109;">
- <!ENTITY ha111 "&ha110; &ha110;">
- <!ENTITY ha112 "&ha111; &ha111;">
- <!ENTITY ha113 "&ha112; &ha112;">
- <!ENTITY ha114 "&ha113; &ha113;">
- <!ENTITY ha115 "&ha114; &ha114;">
- <!ENTITY ha116 "&ha115; &ha115;">
- <!ENTITY ha117 "&ha116; &ha116;">
- <!ENTITY ha118 "&ha117; &ha117;">
- <!ENTITY ha119 "&ha118; &ha118;">
- <!ENTITY ha120 "&ha119; &ha119;">
+ <!ENTITY hello111 "&hello110; &hello110;">
+ <!ENTITY hello112 "&hello111; &hello111;">
+ <!ENTITY hello113 "&hello112; &hello112;">
+ <!ENTITY hello114 "&hello113; &hello113;">
+ <!ENTITY hello115 "&hello114; &hello114;">
+ <!ENTITY hello116 "&hello115; &hello115;">
+ <!ENTITY hello117 "&hello116; &hello116;">
+ <!ENTITY hello118 "&hello117; &hello117;">
+ <!ENTITY hello119 "&hello118; &hello118;">
+ <!ENTITY hello120 "&hello119; &hello119;">
- <!ENTITY ha121 "&ha120; &ha120;">
- <!ENTITY ha122 "&ha121; &ha121;">
- <!ENTITY ha123 "&ha122; &ha122;">
- <!ENTITY ha124 "&ha123; &ha123;">
- <!ENTITY ha125 "&ha124; &ha124;">
- <!ENTITY ha126 "&ha125; &ha125;">
- <!ENTITY ha127 "&ha126; &ha126;">
- <!ENTITY ha128 "&ha127; &ha127;">
+ <!ENTITY hello121 "&hello120; &hello120;">
+ <!ENTITY hello122 "&hello121; &hello121;">
+ <!ENTITY hello123 "&hello122; &hello122;">
+ <!ENTITY hello124 "&hello123; &hello123;">
+ <!ENTITY hello125 "&hello124; &hello124;">
+ <!ENTITY hello126 "&hello125; &hello125;">
+ <!ENTITY hello127 "&hello126; &hello126;">
+ <!ENTITY hello128 "&hello127; &hello127;">
]>
<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
<env:Header/>
<env:Body>
<ns1:echoString xmlns:ns1='http://jbws1582.jaxws.ws.test.jboss.org/'>
- <arg0>&h128;</arg0>
+ <arg0>&hello12;</arg0>
</ns1:echoString>
</env:Body>
</env:Envelope>
15 years, 8 months
- 1
- 0
JBossWS SVN: r9912 - common/trunk/src/main/java/org/jboss/wsf/common.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-29 01:02:29 -0400 (Wed, 29 Apr 2009)
New Revision: 9912
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBWS-1582] cannot disable DOCTYPE declarations because DOMUtils code is highly reused in both Metadata and SOAP message processing layer
Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2009-04-28 17:38:11 UTC (rev 9911)
+++ common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2009-04-29 05:02:29 UTC (rev 9912)
@@ -88,7 +88,6 @@
try
{
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
- factory.setFeature(DISALLOW_DOCTYPE_DECL_FEATURE, true);
if (Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION))
{
factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false);
15 years, 8 months
- 1
- 0
JBossWS SVN: r9911 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-04-28 13:38:11 -0400 (Tue, 28 Apr 2009)
New Revision: 9911
Removed:
stack/native/branches/dlofthouse/JBWS-2633/
Log:
Branch no longer required.
15 years, 8 months
- 1
- 0
JBossWS SVN: r9910 - in stack/native/trunk/modules/testsuite/native-tests/src/test: java/org/jboss/test/ws/jaxws/jbws2633 and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-04-28 13:36:07 -0400 (Tue, 28 Apr 2009)
New Revision: 9910
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633/PhoneBook.wsdl
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633/PhoneBook.wsdl
Log:
[JBWS-2633] Test case for wscompile fails to create valid package name where namespace contains capitalised reserved keyword.
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633 (from rev 9909, stack/native/branches/dlofthouse/JBWS-2633/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633)
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2633/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java 2009-04-28 17:22:56 UTC (rev 9909)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java 2009-04-28 17:36:07 UTC (rev 9910)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.jbws2633;
-
-import java.io.File;
-
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * [JBWS-2633] - Test case to test wscompile where a namespace contains 'Public'
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 28th April 2009
- */
-public class JBWS2633TestCase extends JBossWSTest
-{
- private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
- private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
- private static final String EXT = ":".equals(PS) ? ".sh" : ".bat";
-
- private String JBOSS_HOME = System.getProperty("jboss.home");
-
- public void testWSConsume() throws Exception
- {
- if (true)
- {
- System.out.println("FIXME [JBWS-2633] wscompile fails to create valid package name where namespace contains capitalised reserved keyword.");
- return;
- }
-
- // use absolute path for the output to be re-usable
- String absOutput = "target/wsconsume/jbws2633";
- String wsdlFile = createResourceFile("jaxws/jbws2633/PhoneBook.wsdl").getAbsolutePath();
-
- String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -k -o " + absOutput + " " + wsdlFile;
- executeCommand(command);
-
- String packageDir = new File(absOutput + "/org/jboss/_public/test/ws/jbws2633").getAbsolutePath();
-
- checkFileExists(packageDir, "PhoneBook.java");
- checkFileExists(packageDir, "PhoneBook_Service.java");
-
- packageDir = new File(absOutput + "/org/jboss/_public/test/ws/jbws2633/types").getAbsolutePath();
-
- checkFileExists(packageDir, "Person.java");
- checkFileExists(packageDir, "TelephoneNumber.java");
- }
-
- private static void checkFileExists(String packageDir, String filename)
- {
- File expectedFile = new File(packageDir + FS + filename);
- assertTrue("File '" + filename + "' missing from folder '" + packageDir + "'", expectedFile.exists());
- }
-
-}
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java (from rev 9909, stack/native/branches/dlofthouse/JBWS-2633/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2633/JBWS2633TestCase.java 2009-04-28 17:36:07 UTC (rev 9910)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws2633;
+
+import java.io.File;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-2633] - Test case to test wscompile where a namespace contains 'Public'
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 28th April 2009
+ */
+public class JBWS2633TestCase extends JBossWSTest
+{
+ private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
+ private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
+ private static final String EXT = ":".equals(PS) ? ".sh" : ".bat";
+
+ private String JBOSS_HOME = System.getProperty("jboss.home");
+
+ public void testWSConsume() throws Exception
+ {
+ if (true)
+ {
+ System.out.println("FIXME [JBWS-2633] wscompile fails to create valid package name where namespace contains capitalised reserved keyword.");
+ return;
+ }
+
+ // use absolute path for the output to be re-usable
+ String absOutput = "target/wsconsume/jbws2633";
+ String wsdlFile = createResourceFile("jaxws/jbws2633/PhoneBook.wsdl").getAbsolutePath();
+
+ String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -k -o " + absOutput + " " + wsdlFile;
+ executeCommand(command);
+
+ String packageDir = new File(absOutput + "/org/jboss/_public/test/ws/jbws2633").getAbsolutePath();
+
+ checkFileExists(packageDir, "PhoneBook.java");
+ checkFileExists(packageDir, "PhoneBook_Service.java");
+
+ packageDir = new File(absOutput + "/org/jboss/_public/test/ws/jbws2633/types").getAbsolutePath();
+
+ checkFileExists(packageDir, "Person.java");
+ checkFileExists(packageDir, "TelephoneNumber.java");
+ }
+
+ private static void checkFileExists(String packageDir, String filename)
+ {
+ File expectedFile = new File(packageDir + FS + filename);
+ assertTrue("File '" + filename + "' missing from folder '" + packageDir + "'", expectedFile.exists());
+ }
+
+}
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633 (from rev 9909, stack/native/branches/dlofthouse/JBWS-2633/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633)
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633/PhoneBook.wsdl
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2633/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633/PhoneBook.wsdl 2009-04-28 17:22:56 UTC (rev 9909)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633/PhoneBook.wsdl 2009-04-28 17:36:07 UTC (rev 9910)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.Public.jboss.org/ws/jbws2633' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.Public.jboss.org/ws/jbws2633/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.Public.jboss.org/ws/jbws2633' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.Public.jboss.org/ws/jbws2633/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.Public.jboss.org/ws/jbws2633/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name='firstName' nillable='true' type='string'/>
- <element name='surname' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='areaCode' nillable='true' type='string'/>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633/PhoneBook.wsdl (from rev 9909, stack/native/branches/dlofthouse/JBWS-2633/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633/PhoneBook.wsdl)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633/PhoneBook.wsdl (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2633/PhoneBook.wsdl 2009-04-28 17:36:07 UTC (rev 9910)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.Public.jboss.org/ws/jbws2633' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.Public.jboss.org/ws/jbws2633/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.Public.jboss.org/ws/jbws2633' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.Public.jboss.org/ws/jbws2633/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.Public.jboss.org/ws/jbws2633/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
15 years, 8 months
- 1
- 0