[jbossws-commits] JBossWS SVN: r1920 - in branches/tdiesler/trunk: integration-jboss42 and 7 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-01-11 06:16:46 -0500 (Thu, 11 Jan 2007) New Revision: 1920 Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/ branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml Modified: branches/tdiesler/trunk/integration-jboss40/.classpath branches/tdiesler/trunk/integration-jboss42/.classpath branches/tdiesler/trunk/integration-jboss50/.classpath branches/tdiesler/trunk/integration-tomcat/.classpath branches/tdiesler/trunk/jbossws-core/.classpath branches/tdiesler/trunk/jbossws-tests/.classpath branches/tdiesler/trunk/jbossws-tests/build.xml branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java Log: [JBWS-1407] -Premature end of File exception on createMessage Modified: branches/tdiesler/trunk/integration-jboss40/.classpath =================================================================== --- branches/tdiesler/trunk/integration-jboss40/.classpath 2007-01-11 10:29:56 UTC (rev 1919) +++ branches/tdiesler/trunk/integration-jboss40/.classpath 2007-01-11 11:16:46 UTC (rev 1920) @@ -27,7 +27,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> Modified: branches/tdiesler/trunk/integration-jboss42/.classpath =================================================================== --- branches/tdiesler/trunk/integration-jboss42/.classpath 2007-01-11 10:29:56 UTC (rev 1919) +++ branches/tdiesler/trunk/integration-jboss42/.classpath 2007-01-11 11:16:46 UTC (rev 1920) @@ -27,7 +27,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> Modified: branches/tdiesler/trunk/integration-jboss50/.classpath =================================================================== --- branches/tdiesler/trunk/integration-jboss50/.classpath 2007-01-11 10:29:56 UTC (rev 1919) +++ branches/tdiesler/trunk/integration-jboss50/.classpath 2007-01-11 11:16:46 UTC (rev 1920) @@ -30,7 +30,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> Modified: branches/tdiesler/trunk/integration-tomcat/.classpath =================================================================== --- branches/tdiesler/trunk/integration-tomcat/.classpath 2007-01-11 10:29:56 UTC (rev 1919) +++ branches/tdiesler/trunk/integration-tomcat/.classpath 2007-01-11 11:16:46 UTC (rev 1920) @@ -26,7 +26,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> Modified: branches/tdiesler/trunk/jbossws-core/.classpath =================================================================== --- branches/tdiesler/trunk/jbossws-core/.classpath 2007-01-11 10:29:56 UTC (rev 1919) +++ branches/tdiesler/trunk/jbossws-core/.classpath 2007-01-11 11:16:46 UTC (rev 1920) @@ -25,7 +25,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> Modified: branches/tdiesler/trunk/jbossws-tests/.classpath =================================================================== --- branches/tdiesler/trunk/jbossws-tests/.classpath 2007-01-11 10:29:56 UTC (rev 1919) +++ branches/tdiesler/trunk/jbossws-tests/.classpath 2007-01-11 11:16:46 UTC (rev 1920) @@ -9,7 +9,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-vfs.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/policy-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/policy.jar"/> <classpathentry kind="lib" path="/build/thirdparty/qdox.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/> @@ -35,7 +35,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> Modified: branches/tdiesler/trunk/jbossws-tests/build.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/build.xml 2007-01-11 10:29:56 UTC (rev 1919) +++ branches/tdiesler/trunk/jbossws-tests/build.xml 2007-01-11 11:16:46 UTC (rev 1920) @@ -160,6 +160,7 @@ <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/> <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> + <pathelement location="${thirdparty.dir}/junit.jar"/> <pathelement location="${thirdparty.dir}/qdox.jar"/> <pathelement location="${thirdparty.dir}/policy.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-01-11 10:29:56 UTC (rev 1919) +++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-01-11 11:16:46 UTC (rev 1920) @@ -22,6 +22,8 @@ package org.jboss.test.ws.common.soap; import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPBody; @@ -103,4 +105,21 @@ Element expEnv = DOMUtils.parse(expEnvStr); assertEquals(expEnv, env); } + + // http://jira.jboss.org/jira/browse/JBWS-1407 + // Premature end of File exception on createMessage + public void testPrematureEndOfFile() throws Exception + { + File envFile = new File("resources/common/soap/MessageFactory/jbws1407.xml"); + assertTrue("File exists: " + envFile, envFile.exists()); + + FileInputStream inputStream = new FileInputStream(envFile); + + MessageFactory factory = new MessageFactoryImpl(); + SOAPMessage soapMsg = factory.createMessage(null, inputStream); + SOAPEnvelope env = soapMsg.getSOAPPart().getEnvelope(); + + assertEquals("SOAP-ENV:Envelope", env.getNodeName()); + assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI()); + } } Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml 2007-01-11 10:29:56 UTC (rev 1919) +++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml 2007-01-11 11:16:46 UTC (rev 1920) @@ -0,0 +1,58 @@ +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" + xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:cwmp="urn:dslforum-org:cwmp-1-0" xmlns="urn:dslforum-org:cwmp-1-0"> +<SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" id="_0"> +<cwmp:Inform> + <DeviceId xsi:type="cwmp:DeviceIdStruct"> + <Manufacturer xsi:type="xsd:string">Somebody</Manufacturer> + <OUI xsi:type="xsd:string">9999</OUI> + <ProductClass xsi:type="xsd:string">Somebody</ProductClass> + <SerialNumber xsi:type="xsd:string">1234567890</SerialNumber> + </DeviceId> + <Event xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="cwmp:EventStruct[2]"> + <EventStruct xsi:type="cwmp:EventStruct"> + <EventCode xsi:type="xsd:string">1 BOOT</EventCode> + <CommandKey xsi:type="xsd:string"></CommandKey> + </EventStruct> + <EventStruct xsi:type="cwmp:EventStruct"> + <EventCode xsi:type="xsd:string">4 VALUE CHANGE</EventCode> + <CommandKey xsi:type="xsd:string"></CommandKey> + </EventStruct> + </Event> + <MaxEnvelopes xsi:type="xsd:unsignedInt">1</MaxEnvelopes> + <CurrentTime xsi:type="xsd:dateTime">0000-00-00T00:04:49</CurrentTime> + <RetryCount xsi:type="xsd:unsignedInt">1</RetryCount> + <ParameterList xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="cwmp:ParameterValueStruct[7]"> + <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> + <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.SpecVersion</Name> + <Value xsi:type="xsd:string">1.0</Value> + </ParameterValueStruct> + <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> + <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.HardwareVersion</Name> + <Value xsi:type="xsd:string">1.0002.0</Value> + </ParameterValueStruct> + <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> + <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.SoftwareVersion</Name> + <Value xsi:type="xsd:string">1.01.38</Value> + </ParameterValueStruct><ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> + <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.ProvisioningCode</Name> + <Value xsi:type="xsd:string"></Value> + </ParameterValueStruct> + <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> + <Name xsi:type="xsd:string">InternetGatewayDevice.ManagementServer.ConnectionRequestURL</Name> + <Value xsi:type="xsd:string">http://123.123.123.123:12345/</Value> + </ParameterValueStruct> + <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> + <Name xsi:type="xsd:string">InternetGatewayDevice.ManagementServer.ParameterKey</Name> + <Value xsi:type="xsd:string">parameterkey</Value> + </ParameterValueStruct> + <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct"> + <Name xsi:type="xsd:string">InternetGatewayDevice.WANDevice.1.WANConnectionDevice.1.WANPPPConnection.1.ExternalIPAddress</Name> + <Value xsi:type="xsd:string">192.168.0.101</Value> + </ParameterValueStruct> + </ParameterList> +</cwmp:Inform> +</SOAP-ENV:Body> +</SOAP-ENV:Envelope> \ No newline at end of file Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF