[jbossws-commits] JBossWS SVN: r5943 - in stack/native/branches/tdiesler/trunk: ant-import and 7 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-03-12 11:14:57 -0400 (Wed, 12 Mar 2008) New Revision: 5943 Added: stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/ stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/fastinfoset/ stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/ Removed: stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/wsdl/ Modified: stack/native/branches/tdiesler/trunk/.classpath stack/native/branches/tdiesler/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml stack/native/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml stack/native/branches/tdiesler/trunk/version.properties Log: Add fastinfoset testcases Modified: stack/native/branches/tdiesler/trunk/.classpath =================================================================== --- stack/native/branches/tdiesler/trunk/.classpath 2008-03-12 13:50:18 UTC (rev 5942) +++ stack/native/branches/tdiesler/trunk/.classpath 2008-03-12 15:14:57 UTC (rev 5943) @@ -39,5 +39,6 @@ <classpathentry kind="lib" path="thirdparty/jboss-jaxb-intros.jar"/> <classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/> <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/> + <classpathentry kind="lib" path="thirdparty/FastInfoset.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-03-12 13:50:18 UTC (rev 5942) +++ stack/native/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-03-12 15:14:57 UTC (rev 5943) @@ -111,6 +111,7 @@ <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-fi/${sun-fi}/lib/FastInfoset.jar" dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 13:50:18 UTC (rev 5942) +++ stack/native/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 15:14:57 UTC (rev 5943) @@ -30,6 +30,7 @@ </patternset> <patternset id="jbossws.client.patternset"> + <include name="**/FastInfoset.jar"/> <include name="**/jbossws-client.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> @@ -75,6 +76,7 @@ </patternset> <patternset id="jbossws.service.lib.patternset"> + <include name="**/FastInfoset.jar"/> <include name="**/jboss-jaxb-intros.jar"/> <include name="**/jbossws-core.jar"/> <include name="**/policy.jar"/> Modified: stack/native/branches/tdiesler/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/tdiesler/trunk/ant-import-tests/build-jars-jaxws.xml 2008-03-12 13:50:18 UTC (rev 5942) +++ stack/native/branches/tdiesler/trunk/ant-import-tests/build-jars-jaxws.xml 2008-03-12 15:14:57 UTC (rev 5943) @@ -106,6 +106,13 @@ </fileset> </jar> + <!-- jaxws-fastinfoset --> + <war warfile="${tests.output.dir}/libs/jaxws-fastinfoset.war" webxml="${tests.output.dir}/resources/jaxws/fastinfoset/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.class"/> + </classes> + </war> + <!-- jaxws-handlerlifecycle --> <war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-03-12 13:50:18 UTC (rev 5942) +++ stack/native/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-03-12 15:14:57 UTC (rev 5943) @@ -39,6 +39,7 @@ </path> <path id="tests.extra.classpath"> + <pathelement location="${core.dir}/thirdparty/FastInfoset.jar"/> <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> <pathelement location="${core.dir}/thirdparty/policy.jar"/> Added: stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java =================================================================== --- stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java (rev 0) +++ stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java 2008-03-12 15:14:57 UTC (rev 5943) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.feature; + +// $Id$ + +import javax.xml.ws.WebServiceFeature; + +import org.jboss.ws.Constants; + +/** + * This feature represents the use of FastInfoset + * + * @author Thomas.Diesler(a)jboss.com + * @since 29-Feb-2008 + */ +public final class FastInfosetFeature extends WebServiceFeature +{ + /** + * Constant value identifying the SchemaValidationFeature + */ + public static final String ID = Constants.NS_JBOSSWS_URI + "/features/fastinfoset"; + + /** + * Create an <code>SchemaValidationFeature</code>. + * The instance created will be enabled. + */ + public FastInfosetFeature() + { + this.enabled = true; + } + + /** + * Creates an <code>SchemaValidationFeature</code>. + * + * @param enabled specifies if this feature should be enabled or not + */ + public FastInfosetFeature(boolean enabled) + { + this.enabled = enabled; + } + + /** + * {@inheritDoc} + */ + public String getID() + { + return ID; + } +} Property changes on: stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java =================================================================== --- stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java (rev 0) +++ stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java 2008-03-12 15:14:57 UTC (rev 5943) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.fastinfoset; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(targetNamespace = "http://org.jboss.ws/fastinfoset") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface FastInfoset +{ + @WebMethod + String echo(String code); +} Property changes on: stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java =================================================================== --- stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java (rev 0) +++ stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java 2008-03-12 15:14:57 UTC (rev 5943) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.fastinfoset; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; + +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.DOMWriter; +import org.jboss.wsf.test.JBossWSTest; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import com.sun.xml.fastinfoset.dom.DOMDocumentParser; +import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer; + +/** + * Test FastInfoset functionality + * + * @author Thomas.Diesler(a)jboss.com + * @since 12-Mar-2008 + */ +public class FastInfosetAPITestCase extends JBossWSTest +{ + public void testSimple() throws Exception + { + DOMDocumentSerializer serializer = new DOMDocumentSerializer(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + serializer.setOutputStream(baos); + + String srcXML = "<root>hello world</root>"; + Element srcRoot = DOMUtils.parse(srcXML); + serializer.serialize(srcRoot); + + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + DOMDocumentParser parser = new DOMDocumentParser(); + Document resDoc = DOMUtils.getDocumentBuilder().newDocument(); + parser.parse(resDoc, bais); + + String resXML = DOMWriter.printNode(resDoc, false); + assertEquals(srcXML, resXML); + } + + public void testSimpleNamespace() throws Exception + { + DOMDocumentSerializer serializer = new DOMDocumentSerializer(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + serializer.setOutputStream(baos); + + String srcXML = "<root xmlns='http://somens'>hello world</root>"; + Element srcRoot = DOMUtils.parse(srcXML); + serializer.serialize(srcRoot); + + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + DOMDocumentParser parser = new DOMDocumentParser(); + Document resDoc = DOMUtils.getDocumentBuilder().newDocument(); + parser.parse(resDoc, bais); + + String resXML = DOMWriter.printNode(resDoc, false); + assertEquals(srcXML, resXML); + } + + public void testPrefixedNamespace() throws Exception + { + DOMDocumentSerializer serializer = new DOMDocumentSerializer(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + serializer.setOutputStream(baos); + + String srcXML = "<ns1:root xmlns:ns1='http://somens'>hello world</ns1:root>"; + Element srcRoot = DOMUtils.parse(srcXML); + serializer.serialize(srcRoot); + + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + DOMDocumentParser parser = new DOMDocumentParser(); + Document resDoc = DOMUtils.getDocumentBuilder().newDocument(); + parser.parse(resDoc, bais); + + String resXML = DOMWriter.printNode(resDoc, false); + assertEquals(srcXML, resXML); + } +} Property changes on: stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java =================================================================== --- stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java (rev 0) +++ stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java 2008-03-12 15:14:57 UTC (rev 5943) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.fastinfoset; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +@WebService(targetNamespace = "http://org.jboss.ws/fastinfoset") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class FastInfosetEndpoint +{ + // provide logging + private static Logger log = Logger.getLogger(FastInfosetEndpoint.class); + + @WebMethod + public String echo(String code) + { + log.info(code); + return code; + } +} Property changes on: stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java =================================================================== --- stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java (rev 0) +++ stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java 2008-03-12 15:14:57 UTC (rev 5943) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.fastinfoset; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service21; + +import junit.framework.Test; + +import org.jboss.ws.feature.FastInfosetFeature; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test FastInfoset functionality + * + * @author Thomas.Diesler(a)jboss.com + * @since 12-Mar-2008 + */ +public class FastInfosetTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(FastInfosetTestCase.class, "jaxws-fastinfoset.war"); + } + + public void testSimple() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-fastinfoset?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/fastinfoset", "FastInfosetEndpointService"); + Service21 service = Service21.create(wsdlURL, serviceName); + + FastInfosetFeature feature = new FastInfosetFeature(); + FastInfoset port = service.getPort(FastInfoset.class, feature); + String retStr = port.echo("hello world"); + assertEquals("hello world", retStr); + } +} Property changes on: stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF (from rev 5942, stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/jbws1172/WEB-INF) Modified: stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml =================================================================== --- stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/jbws1172/WEB-INF/web.xml 2008-03-12 13:50:18 UTC (rev 5942) +++ stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml 2008-03-12 15:14:57 UTC (rev 5943) @@ -4,22 +4,12 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> <servlet> - <servlet-name>NonValidatingEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1172.NonValidatingEndpoint</servlet-class> + <servlet-name>FastInfosetEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.fastinfoset.FastInfosetEndpoint</servlet-class> </servlet> - <servlet> - <servlet-name>ValidatingEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1172.ValidatingEndpoint</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>NonValidatingEndpoint</servlet-name> - <url-pattern>/noval</url-pattern> + <servlet-name>FastInfosetEndpoint</servlet-name> + <url-pattern>/*</url-pattern> </servlet-mapping> - - <servlet-mapping> - <servlet-name>ValidatingEndpoint</servlet-name> - <url-pattern>/doval</url-pattern> - </servlet-mapping> </web-app> \ No newline at end of file Modified: stack/native/branches/tdiesler/trunk/version.properties =================================================================== --- stack/native/branches/tdiesler/trunk/version.properties 2008-03-12 13:50:18 UTC (rev 5942) +++ stack/native/branches/tdiesler/trunk/version.properties 2008-03-12 15:14:57 UTC (rev 5943) @@ -62,6 +62,7 @@ junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4 +sun-fi=1.2.2 sun-jaf=1.1 sun-javamail=1.4 sun-servlet=2.4