April 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r13994 - in shared-testsuite/trunk/src/test: java/org/jboss/test/ws/jaxws and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-04-04 15:35:39 -0400 (Mon, 04 Apr 2011) New Revision: 13994 Added: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/AttackedEndpointImpl.java shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/Endpoint.java shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/EndpointImpl.java shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/ shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/ shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/attack-web.xml shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/web.xml shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/ shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/service.wsdl shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/attack-message-1.xml shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/attack-message-2.xml shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/message.xml Modified: shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml Log: refactoring test to shared testsuite Modified: shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml 2011-04-04 19:34:52 UTC (rev 13993) +++ shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml 2011-04-04 19:35:39 UTC (rev 13994) @@ -283,6 +283,26 @@ </metainf> </jar> +  + <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1582.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1582/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-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}/test-resources/jaxws/jbws1582/WEB-INF"> + <include name="wsdl/service.wsdl" /> + </webinf> + </war> + <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1582-attacked.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1582/WEB-INF/attack-web.xml"> + <classes dir="${tests.output.dir}/test-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}/test-resources/jaxws/jbws1582/WEB-INF"> + <include name="wsdl/attack-service.wsdl" /> + </webinf> + </war> +  <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1611/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Added: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/AttackedEndpointImpl.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/AttackedEndpointImpl.java (rev 0) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/AttackedEndpointImpl.java 2011-04-04 19:35:39 UTC (rev 13994) @@ -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: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/Endpoint.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/Endpoint.java (rev 0) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/Endpoint.java 2011-04-04 19:35:39 UTC (rev 13994) @@ -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: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/EndpointImpl.java (rev 0) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/EndpointImpl.java 2011-04-04 19:35:39 UTC (rev 13994) @@ -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: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java (rev 0) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2011-04-04 19:35:39 UTC (rev 13994) @@ -0,0 +1,169 @@ +/* + * 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.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 testSOAPMessageAttack1() throws Exception + { + String response = getResponse("jaxws/jbws1582/attack-message-1.xml"); + assertTrue(response.contains("HTTP/1.1 500")); + if (isIntegrationCXF()) + { + assertTrue(response.contains("Error reading XMLStreamReader")); + } + else if(isIntegrationNative()) + { + assertTrue(response.contains("DOCTYPE is disallowed when the feature")); + assertTrue(response.contains("http://apache.org/xml/features/disallow-doctype-decl")); + } + else + { + throw new IllegalStateException("Unknown SOAP stack in use"); + } + } + + public void testSOAPMessageAttack2() throws Exception + { + String response = getResponse("jaxws/jbws1582/attack-message-2.xml"); + assertTrue(response.contains("HTTP/1.1 500")); + if (isIntegrationCXF()) + { + assertTrue(response.contains("Error reading XMLStreamReader")); + } + else if(isIntegrationNative()) + { + assertTrue(response.contains("DOCTYPE is disallowed when the feature")); + assertTrue(response.contains("http://apache.org/xml/features/disallow-doctype-decl")); + } + else + { + throw new IllegalStateException("Unknown SOAP stack in use"); + } + } + + private String getResponse(String requestFile) throws Exception + { + final String CRNL = "\r\n"; + String content = getContent(new FileInputStream(getResourceFile(requestFile))); + Socket socket = new Socket(); + socket.connect(new InetSocketAddress(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: " + 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 + { + if (isIntegrationCXF()) + { + System.out.println("FIXME [JBWS-3262] fix issue in CXF so the following test will start passing"); // TODO: remove once fixed on CXF side + return; + } + try + { + deploy("jaxws-jbws1582-attacked.war"); + fail("deployment failure expected"); + } + catch (Exception e) + { + e.printStackTrace(); + log.warn(e.getMessage(), e); + } + finally + { + 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: shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/attack-web.xml =================================================================== --- shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/attack-web.xml (rev 0) +++ shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/attack-web.xml 2011-04-04 19:35:39 UTC (rev 13994) @@ -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: shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/web.xml =================================================================== --- shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/web.xml (rev 0) +++ shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/web.xml 2011-04-04 19:35:39 UTC (rev 13994) @@ -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: shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl =================================================================== --- shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl (rev 0) +++ shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/attack-service.wsdl 2011-04-04 19:35:39 UTC (rev 13994) @@ -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: shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/service.wsdl =================================================================== --- shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/service.wsdl (rev 0) +++ shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/WEB-INF/wsdl/service.wsdl 2011-04-04 19:35:39 UTC (rev 13994) @@ -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: shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/attack-message-1.xml =================================================================== --- shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/attack-message-1.xml (rev 0) +++ shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/attack-message-1.xml 2011-04-04 19:35:39 UTC (rev 13994) @@ -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: shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/attack-message-2.xml =================================================================== --- shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/attack-message-2.xml (rev 0) +++ shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/attack-message-2.xml 2011-04-04 19:35:39 UTC (rev 13994) @@ -0,0 +1,17 @@ +<?xml version="1.0" ?> +<!DOCTYPE root [ + <!ENTITY a0 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa! aaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"> + <!ENTITY a1 "&a0;&a0;&a0;&a0;&a0;&a0;&a0;&a0;"> + <!ENTITY a2 "&a1;&a1;&a1;&a1;&a1;&a1;&a1;&a1;&a1;&a1;&a1;&a1;&a1;&a1;&a1;&a1;"> + <!ENTITY a3 "&a2;&a2;&a2;&a2;"> + <!ENTITY a4 "&a3;&a3;&a3;&a3;&a3;&a3;&a3;&a3;&a3;&a3;&a3;&a3;"> + <!ENTITY a5 "&a4;&a4;&a4;&a4;"> +]> +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> + <env:Header/> + <env:Body> + <ns1:echoString xmlns:ns1='&a5;http://www.xx.xx/'> + <arg0>&a5;</arg0> + </ns1:echoString> + </env:Body> +</env:Envelope> Added: shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/message.xml =================================================================== --- shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/message.xml (rev 0) +++ shared-testsuite/trunk/src/test/resources/jaxws/jbws1582/message.xml 2011-04-04 19:35:39 UTC (rev 13994) @@ -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> +

13 years

1
0
0 / 0

JBossWS SVN: r13993 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-04-04 15:34:52 -0400 (Mon, 04 Apr 2011) New Revision: 13993 Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/ Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml Log: refactoring test to shared testsuite Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-04 12:19:34 UTC (rev 13992) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-04-04 19:34:52 UTC (rev 13993) @@ -193,26 +193,6 @@ </metainf> </jar> -  - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1582.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1582/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-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}/test-resources/jaxws/jbws1582/WEB-INF"> - <include name="wsdl/service.wsdl" /> - </webinf> - </war> - <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1582-attacked.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1582/WEB-INF/attack-web.xml"> - <classes dir="${tests.output.dir}/test-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}/test-resources/jaxws/jbws1582/WEB-INF"> - <include name="wsdl/attack-service.wsdl" /> - </webinf> - </war> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1809.jar"> <fileset dir="${tests.output.dir}/test-classes">

13 years

1
0
0 / 0

JBossWS SVN: r13992 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582 and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-04-04 08:19:34 -0400 (Mon, 04 Apr 2011) New Revision: 13992 Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/attack-message-1.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/attack-message-2.xml Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1582/attack-message.xml Modified: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd stack/native/trunk/modules/core/src/main/resources/schema/wsdl20.xsd stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd 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/samples/wseventing/WEB-INF/wsdl/ws-addr.xsd stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wseventing/WEB-INF/wsdl/ws-addr.xsd Log: [JBWS-1582] DOCTYPEs are not allowed by default - users can use JVM property -Dorg.jboss.ws.enable_doctype_decl=true to allow them Modified: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd =================================================================== --- stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd 2011-04-04 12:16:40 UTC (rev 13991) +++ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd 2011-04-04 12:19:34 UTC (rev 13992) @@ -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: stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd =================================================================== --- stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd 2011-04-04 12:16:40 UTC (rev 13991) +++ stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd 2011-04-04 12:19:34 UTC (rev 13992) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE schema +   <!-- W3C XML Schema defined in the Web Services Addressing 1.0 specification http://www.w3.org/TR/ws-addr-core

13 years

1
0
0 / 0

JBossWS SVN: r13991 - common/trunk/src/main/java/org/jboss/wsf/common.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-04-04 08:16:40 -0400 (Mon, 04 Apr 2011) New Revision: 13991 Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java Log: [JBWS-1582] disable DOCTYPEs by default - allow to turn it on with JVM property Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-04-04 09:42:23 UTC (rev 13990) +++ common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2011-04-04 12:16:40 UTC (rev 13991) @@ -75,11 +75,14 @@ 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 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 String documentBuilderFactoryName; private static final boolean alwaysResolveFactoryName = Boolean.getBoolean(Constants.ALWAYS_RESOLVE_DOCUMENT_BUILDER_FACTORY); private static final boolean disableDeferedNodeExpansion = Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION); + 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<Document> documentThreadLocal = new ThreadLocal<Document>(); @@ -118,10 +121,14 @@ { factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false); } + if (!enableDoctypeDeclaration) + { + factory.setFeature(DISALLOW_DOCTYPE_DECL_FEATURE, true); + } } catch (ParserConfigurationException pce) { - log.error(pce); + log.fatal("Serious security risk, not able to configure parser feature", pce); } DocumentBuilder builder = factory.newDocumentBuilder();

13 years

1
0
0 / 0

JBossWS SVN: r13990 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-04 05:42:23 -0400 (Mon, 04 Apr 2011) New Revision: 13990 Modified: stack/cxf/trunk/pom.xml Log: Updating pom after AS7 Beta2 release Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-04-04 06:37:58 UTC (rev 13989) +++ stack/cxf/trunk/pom.xml 2011-04-04 09:42:23 UTC (rev 13990) @@ -55,7 +55,7 @@ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version> -->  - <jboss700.version>7.0.0.Beta2-SNAPSHOT</jboss700.version> + <jboss700.version>7.0.0.Beta2</jboss700.version> <cxf.version>2.3.3-patch-01</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> <cxf.asm.version>3.3</cxf.asm.version>

13 years

1
0
0 / 0

JBossWS SVN: r13989 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-04-04 02:37:58 -0400 (Mon, 04 Apr 2011) New Revision: 13989 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: synch with AS7 upstream Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-04 06:36:49 UTC (rev 13988) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-04 06:37:58 UTC (rev 13989) @@ -818,7 +818,7 @@ <profile> <id>jboss700</id> <properties> - <jboss.version>7.0.0.Beta2-SNAPSHOT</jboss.version> + <jboss.version>7.0.0.Beta2</jboss.version> <jbossws.integration.target>jboss700</jbossws.integration.target> </properties> <dependencies>

13 years

1
0
0 / 0

JBossWS SVN: r13988 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-04-04 02:36:49 -0400 (Mon, 04 Apr 2011) New Revision: 13988 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: sync. with AS7 upstream Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-04-01 16:19:57 UTC (rev 13987) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-04-04 06:36:49 UTC (rev 13988) @@ -661,7 +661,7 @@ <profile> <id>jboss700</id> <properties> - <jboss.version>7.0.0.Beta2-SNAPSHOT</jboss.version> + <jboss.version>7.0.0.Beta2</jboss.version> <jbossws.integration.target>jboss700</jbossws.integration.target> <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> </properties>

13 years

1
0
0 / 0

JBossWS SVN: r13987 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/main/java/org/jboss/wsf/test and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-01 12:19:57 -0400 (Fri, 01 Apr 2011) New Revision: 13987 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/ClientHelper.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/TestServlet.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPServletTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java Log: Adding an in-container servlet-client-based version of gzip testcase, refactoring the test a bit and fixing an issue with erroneusly re-using HTTPConduit Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-04-01 09:03:29 UTC (rev 13986) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-04-01 16:19:57 UTC (rev 13987) @@ -85,6 +85,19 @@ <include name="org/jboss/test/ws/jaxws/cxf/gzip/HelloWorld*.class"/> </classes> </war> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-gzip-client.war" + manifest="${tests.output.dir}/test-resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF" + needxmlfile='false'> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/gzip/Helper.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/gzip/HelloWorld.class"/> + </classes> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/wsf/test/TestServlet.class"/> + <include name="org/jboss/wsf/test/ClientHelper.class"/> + </classes> + </war>  <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jaxbintros.jar"> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/ClientHelper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/ClientHelper.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/ClientHelper.java 2011-04-01 16:19:57 UTC (rev 13987) @@ -0,0 +1,27 @@ +/* + * 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.wsf.test; + +public interface ClientHelper +{ + public void setTargetEndpoint(String address); +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/TestServlet.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/TestServlet.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/TestServlet.java 2011-04-01 16:19:57 UTC (rev 13987) @@ -0,0 +1,135 @@ +/* + * 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.wsf.test; + +import java.io.IOException; +import java.io.PrintWriter; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * @author alessio.soldano(a)jboss.com + * @since 01-Apr-2011 + * + */ +@WebServlet(name = "TestServlet", urlPatterns = "/*") +public class TestServlet extends HttpServlet +{ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + String helperClassName = req.getParameter("helper"); + if (helperClassName == null || helperClassName.length() == 0) + throw new ServletException("helper not specified!"); + String path = req.getParameter("path"); + if (path == null || path.length() == 0) + throw new ServletException("path not specified!"); + try + { + ClientHelper helper = (ClientHelper) Class.forName(helperClassName).newInstance(); + helper.setTargetEndpoint("http://" + System.getProperty("jboss.bind.address", "localhost") + ":8080" + path); + List<String> failedTests = new LinkedList<String>(); + List<String> errorTests = new LinkedList<String>(); + Method[] methods = helper.getClass().getMethods(); + String methodName = req.getParameter("method"); + int testsRun = 0; + if (methodName != null && methodName.length() > 0) + { + Method m = null; + m = helper.getClass().getMethod(methodName); + testsRun++; + invokeMethod(m, helper, failedTests, errorTests); + } + else + { + for (Method m : methods) + { + if (m.getName().startsWith("test") && m.getParameterTypes().length == 0 + && m.getReturnType().equals(boolean.class)) + { + testsRun++; + invokeMethod(m, helper, failedTests, errorTests); + } + } + } + if (failedTests.isEmpty() && errorTests.isEmpty()) + { + res.getWriter().print(testsRun); + } + else + { + PrintWriter w = res.getWriter(); + w.print("# Failed tests: "); + for (Iterator<String> it = failedTests.iterator(); it.hasNext();) + { + w.print(it.next()); + if (it.hasNext()) + w.print(", "); + } + res.getWriter().print(" # Error tests: "); + for (Iterator<String> it = errorTests.iterator(); it.hasNext();) + { + w.print(it.next()); + if (it.hasNext()) + w.print(", "); + } + } + } + catch (Exception e) + { + throw new ServletException(e); + } + } + + private void invokeMethod(Method m, ClientHelper helper, List<String> failedTests, List<String> errorTests) throws ServletException + { + try + { + if (!(Boolean)m.invoke(helper)) + { + failedTests.add(m.getName()); + } + } + catch (InvocationTargetException e) + { + Throwable thrownException = e.getTargetException(); + errorTests.add(m.getName() + ": " + thrownException.getClass().getName() + " " + thrownException.getMessage()); + thrownException.printStackTrace(); + } + catch (Exception e) + { + throw new ServletException(e); + } + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java 2011-04-01 16:19:57 UTC (rev 13987) @@ -0,0 +1,51 @@ +/* + * 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.cxf.gzip; + +import java.util.List; +import java.util.Map; + +import org.apache.cxf.helpers.CastUtils; +import org.apache.cxf.helpers.HttpHeaderHelper; +import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.message.Message; +import org.apache.cxf.transport.http.gzip.GZIPInInterceptor; + +public class GZIPEnforcingInInterceptor extends GZIPInInterceptor +{ + @Override + public void handleMessage(Message message) throws Fault + { + Map<String, List<String>> protocolHeaders = CastUtils.cast((Map<?, ?>) message.get(Message.PROTOCOL_HEADERS)); + if (protocolHeaders != null) + { + List<String> contentEncoding = HttpHeaderHelper.getHeader(protocolHeaders, + HttpHeaderHelper.CONTENT_ENCODING); + if (contentEncoding != null && (contentEncoding.contains("gzip") || contentEncoding.contains("x-gzip"))) + { + super.handleMessage(message); + return; + } + } + throw new RuntimeException("Content-Encoding gzip not found!"); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPServletTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPServletTestCase.java 2011-04-01 16:19:57 UTC (rev 13987) @@ -0,0 +1,85 @@ +/* + * 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.cxf.gzip; + +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; + +/** + * This covers the same tests of GZIPTestCase but runs them via a Servlet client + * + * @author alessio.soldano(a)jboss.com + * @since 01-Apr-2011 + * + */ +public class GZIPServletTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSCXFTestSetup(GZIPServletTestCase.class, "jaxws-cxf-gzip.war, jaxws-cxf-gzip-client.war"); + } + + public void testGZIPUsingFeatureOnBus() throws Exception + { + assertEquals("1", runTestInContainer("testGZIPUsingFeatureOnBus")); + } + + public void testGZIPUsingFeatureOnClient() throws Exception + { + assertEquals("1", runTestInContainer("testGZIPUsingFeatureOnClient")); + } + + public void testGZIPServerSideOnlyInterceptorOnClient() throws Exception + { + assertEquals("1", runTestInContainer("testGZIPServerSideOnlyInterceptorOnClient")); + } + + public void testFailureGZIPServerSideOnlyInterceptorOnClient() throws Exception + { + assertEquals("1", runTestInContainer("testFailureGZIPServerSideOnlyInterceptorOnClient")); + } + + public void testGZIPServerSideOnlyInterceptorsOnBus() throws Exception + { + assertEquals("1", runTestInContainer("testGZIPServerSideOnlyInterceptorsOnBus")); + } + + public void testFailureGZIPServerSideOnlyInterceptorsOnBus() throws Exception + { + assertEquals("1", runTestInContainer("testFailureGZIPServerSideOnlyInterceptorsOnBus")); + } + + private String runTestInContainer(String test) throws Exception + { + URL url = new URL("http://" + getServerHost() + + ":8080/jaxws-cxf-gzip-client?path=/jaxws-cxf-gzip/HelloWorldService/HelloWorldImpl&method=" + test + + "&helper=" + Helper.class.getName()); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + return br.readLine(); + } +} Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java 2011-04-01 09:03:29 UTC (rev 13986) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPTestCase.java 2011-04-01 16:19:57 UTC (rev 13987) @@ -21,29 +21,8 @@ */ package org.jboss.test.ws.jaxws.cxf.gzip; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.List; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - import junit.framework.Test; -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.apache.cxf.endpoint.Client; -import org.apache.cxf.frontend.ClientProxy; -import org.apache.cxf.helpers.CastUtils; -import org.apache.cxf.helpers.HttpHeaderHelper; -import org.apache.cxf.interceptor.Fault; -import org.apache.cxf.message.Message; -import org.apache.cxf.transport.http.HTTPConduit; -import org.apache.cxf.transport.http.gzip.GZIPFeature; -import org.apache.cxf.transport.http.gzip.GZIPInInterceptor; -import org.apache.cxf.transport.http.gzip.GZIPOutInterceptor; -import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -56,158 +35,50 @@ public class GZIPTestCase extends JBossWSTest { private String gzipFeatureEndpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-gzip/HelloWorldService/HelloWorldImpl"; + + private Helper helper; - private HelloWorld port; - public static Test suite() { return new JBossWSCXFTestSetup(GZIPTestCase.class, "jaxws-cxf-gzip.war"); } - public void testGZIPUsingFeatureOnBus() throws Exception + private Helper getHelper() { - Bus bus = BusFactory.newInstance().createBus(); - try + if (helper == null) { - BusFactory.setThreadDefaultBus(bus); - - GZIPFeature gzipFeature = new GZIPFeature(); - gzipFeature.setThreshold(0); - gzipFeature.initialize(bus); - - HelloWorld port = getPort(); - assertEquals("foo", port.echo("foo")); + helper = new Helper(gzipFeatureEndpointURL); } - finally - { - bus.shutdown(true); - } + return helper; } + public void testGZIPUsingFeatureOnBus() throws Exception + { + assertTrue(getHelper().testGZIPUsingFeatureOnBus()); + } + public void testGZIPUsingFeatureOnClient() throws Exception { - HelloWorld port = getPort(); - Client client = ClientProxy.getClient(port); - GZIPFeature gzipFeature = new GZIPFeature(); - gzipFeature.setThreshold(0); - gzipFeature.initialize(client, BusFactory.getThreadDefaultBus()); - assertEquals("foo", port.echo("foo")); + assertTrue(getHelper().testGZIPUsingFeatureOnClient()); } public void testGZIPServerSideOnlyInterceptorOnClient() throws Exception { - HelloWorld port = getPort(); - Client client = ClientProxy.getClient(port); - HTTPConduit conduit = (HTTPConduit)client.getConduit(); - HTTPClientPolicy policy = conduit.getClient(); - //enable Accept gzip, otherwise the server will not try to reply using gzip - policy.setAcceptEncoding("gzip;q=1.0, identity; q=0.5, *;q=0"); - //add interceptor for decoding gzip message - client.getInInterceptors().add(new GZIPEnforcingInInterceptor()); - assertEquals("foo", port.echo("foo")); + assertTrue(getHelper().testGZIPServerSideOnlyInterceptorOnClient()); } public void testFailureGZIPServerSideOnlyInterceptorOnClient() throws Exception { - HelloWorld port = getPort(); - Client client = ClientProxy.getClient(port); - HTTPConduit conduit = (HTTPConduit)client.getConduit(); - HTTPClientPolicy policy = conduit.getClient(); - //enable Accept gzip, otherwise the server will not try to reply using gzip - policy.setAcceptEncoding("gzip;q=1.0, identity; q=0.5, *;q=0"); - try - { - port.echo("foo"); - fail(); - } - catch (Exception e) - { - //expected exception, as the client is not able to decode gzip message - } + assertTrue(getHelper().testFailureGZIPServerSideOnlyInterceptorOnClient()); } public void testGZIPServerSideOnlyInterceptorsOnBus() throws Exception { - Bus bus = BusFactory.newInstance().createBus(); - try - { - //enable Accept gzip, otherwise the server will not try to reply using gzip - GZIPOutInterceptor outInterceptor = new GZIPOutInterceptor(); - outInterceptor.setThreshold(1024*1024); // 1MB -> no gzip on request - bus.getOutInterceptors().add(outInterceptor); - //add interceptor for decoding gzip message - bus.getInInterceptors().add(new GZIPEnforcingInInterceptor()); - BusFactory.setThreadDefaultBus(bus); - HelloWorld port = getPort(); - assertEquals("foo", port.echo("foo")); - } - finally - { - bus.shutdown(true); - } + assertTrue(getHelper().testGZIPServerSideOnlyInterceptorsOnBus()); } public void testFailureGZIPServerSideOnlyInterceptorsOnBus() throws Exception { - Bus bus = BusFactory.newInstance().createBus(); - try - { - //enable Accept gzip, otherwise the server will not try to reply using gzip - GZIPOutInterceptor outInterceptor = new GZIPOutInterceptor(); - outInterceptor.setThreshold(1024*1024); // 1MB -> no gzip on request - bus.getOutInterceptors().add(outInterceptor); - BusFactory.setThreadDefaultBus(bus); - HelloWorld port = getPort(); - try - { - port.echo("foo"); - fail(); - } - catch (Exception e) - { - //expected exception, as the client is not able to decode gzip message - } - } - finally - { - bus.shutdown(true); - } + assertTrue(getHelper().testFailureGZIPServerSideOnlyInterceptorsOnBus()); } - - private HelloWorld getPort() throws MalformedURLException - { - if (port == null) - { - URL wsdlURL = new URL(gzipFeatureEndpointURL + "?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/gzip", "HelloWorldService"); - Service service = Service.create(wsdlURL, serviceName); - QName portQName = new QName("http://org.jboss.ws/jaxws/cxf/gzip", "HelloWorldImplPort"); - port = (HelloWorld) service.getPort(portQName, HelloWorld.class); - } - return port; - } - - /** - * A test extension of the GZIPInInterceptor that requires all received messages to be gzip encoded - * - */ - private class GZIPEnforcingInInterceptor extends GZIPInInterceptor - { - @Override - public void handleMessage(Message message) throws Fault - { - Map<String, List<String>> protocolHeaders = CastUtils.cast((Map<?, ?>) message.get(Message.PROTOCOL_HEADERS)); - if (protocolHeaders != null) - { - List<String> contentEncoding = HttpHeaderHelper.getHeader(protocolHeaders, - HttpHeaderHelper.CONTENT_ENCODING); - if (contentEncoding != null && (contentEncoding.contains("gzip") || contentEncoding.contains("x-gzip"))) - { - super.handleMessage(message); - return; - } - } - throw new RuntimeException("Content-Encoding gzip not found!"); - } - } } Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java 2011-04-01 16:19:57 UTC (rev 13987) @@ -0,0 +1,180 @@ +/* + * 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.cxf.gzip; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.endpoint.Client; +import org.apache.cxf.frontend.ClientProxy; +import org.apache.cxf.transport.http.HTTPConduit; +import org.apache.cxf.transport.http.gzip.GZIPFeature; +import org.apache.cxf.transport.http.gzip.GZIPOutInterceptor; +import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; +import org.jboss.wsf.test.ClientHelper; + +public class Helper implements ClientHelper +{ + private String gzipFeatureEndpointURL; + + public Helper() + { + + } + + public Helper(String endpointURL) + { + setTargetEndpoint(endpointURL); + } + + public boolean testGZIPUsingFeatureOnBus() throws Exception + { + Bus bus = BusFactory.newInstance().createBus(); + try + { + BusFactory.setThreadDefaultBus(bus); + + GZIPFeature gzipFeature = new GZIPFeature(); + gzipFeature.setThreshold(0); + gzipFeature.initialize(bus); + + HelloWorld port = getPort(); + return ("foo".equals(port.echo("foo"))); + } + finally + { + bus.shutdown(true); + } + } + + public boolean testGZIPUsingFeatureOnClient() throws Exception + { + HelloWorld port = getPort(); + Client client = ClientProxy.getClient(port); + GZIPFeature gzipFeature = new GZIPFeature(); + gzipFeature.setThreshold(0); + gzipFeature.initialize(client, BusFactory.getThreadDefaultBus()); + return ("foo".equals(port.echo("foo"))); + } + + public boolean testGZIPServerSideOnlyInterceptorOnClient() throws Exception + { + HelloWorld port = getPort(); + Client client = ClientProxy.getClient(port); + HTTPConduit conduit = (HTTPConduit)client.getConduit(); + HTTPClientPolicy policy = conduit.getClient(); + //enable Accept gzip, otherwise the server will not try to reply using gzip + policy.setAcceptEncoding("gzip;q=1.0, identity; q=0.5, *;q=0"); + //add interceptor for decoding gzip message + client.getInInterceptors().add(new GZIPEnforcingInInterceptor()); + return ("foo".equals(port.echo("foo"))); + } + + public boolean testFailureGZIPServerSideOnlyInterceptorOnClient() throws Exception + { + HelloWorld port = getPort(); + Client client = ClientProxy.getClient(port); + HTTPConduit conduit = (HTTPConduit)client.getConduit(); + HTTPClientPolicy policy = conduit.getClient(); + //enable Accept gzip, otherwise the server will not try to reply using gzip + policy.setAcceptEncoding("gzip;q=1.0, identity; q=0.5, *;q=0"); + try + { + port.echo("foo"); + return false; + } + catch (Exception e) + { + //expected exception, as the client is not able to decode gzip message + return true; + } + } + + public boolean testGZIPServerSideOnlyInterceptorsOnBus() throws Exception + { + Bus bus = BusFactory.newInstance().createBus(); + try + { + //enable Accept gzip, otherwise the server will not try to reply using gzip + GZIPOutInterceptor outInterceptor = new GZIPOutInterceptor(); + outInterceptor.setThreshold(1024*1024); // 1MB -> no gzip on request + bus.getOutInterceptors().add(outInterceptor); + //add interceptor for decoding gzip message + bus.getInInterceptors().add(new GZIPEnforcingInInterceptor()); + BusFactory.setThreadDefaultBus(bus); + HelloWorld port = getPort(); + return ("foo".equals(port.echo("foo"))); + } + finally + { + bus.shutdown(true); + } + } + + public boolean testFailureGZIPServerSideOnlyInterceptorsOnBus() throws Exception + { + Bus bus = BusFactory.newInstance().createBus(); + try + { + //enable Accept gzip, otherwise the server will not try to reply using gzip + GZIPOutInterceptor outInterceptor = new GZIPOutInterceptor(); + outInterceptor.setThreshold(1024*1024); // 1MB -> no gzip on request + bus.getOutInterceptors().add(outInterceptor); + BusFactory.setThreadDefaultBus(bus); + HelloWorld port = getPort(); + try + { + port.echo("foo"); + return false; + } + catch (Exception e) + { + //expected exception, as the client is not able to decode gzip message + return true; + } + } + finally + { + bus.shutdown(true); + } + } + + private HelloWorld getPort() throws MalformedURLException + { + URL wsdlURL = new URL(gzipFeatureEndpointURL + "?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/gzip", "HelloWorldService"); + Service service = Service.create(wsdlURL, serviceName); + QName portQName = new QName("http://org.jboss.ws/jaxws/cxf/gzip", "HelloWorldImplPort"); + return (HelloWorld) service.getPort(portQName, HelloWorld.class); + } + + @Override + public void setTargetEndpoint(String address) + { + this.gzipFeatureEndpointURL = address; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF 2011-04-01 16:19:57 UTC (rev 13987) @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 +Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services \ No newline at end of file

13 years

1
0
0 / 0

JBossWS SVN: r13986 - shared-testsuite/trunk/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-01 05:03:29 -0400 (Fri, 01 Apr 2011) New Revision: 13986 Modified: shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml Log: Fixing classpath related failure in bind distro testsuite (cxf stack) Modified: shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-03-31 16:35:24 UTC (rev 13985) +++ shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-04-01 09:03:29 UTC (rev 13986) @@ -431,6 +431,9 @@ <fileset dir="${jboss.home}/modules/javax/mail/api/main/"> <include name="mail-*.jar"/> </fileset> + <fileset dir="${jboss.home}/modules/javax/servlet/api/main/"> + <include name="jboss-servlet-api_3.0_spec-*.jar"/> + </fileset> </path> </target>

13 years

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 April 2011