JBossWS SVN: r1406 - in trunk/src: main/java/org/jboss/ws/soap test/java/org/jboss/test/ws/jaxws/jsr181/webmethod test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2006-11-06 20:35:50 -0500 (Mon, 06 Nov 2006)
New Revision: 1406
Modified:
trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
Log:
Fix JBREM-626
Modified: trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-11-06 19:21:25 UTC (rev 1405)
+++ trunk/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-11-07 01:35:50 UTC (rev 1406)
@@ -43,6 +43,7 @@
import org.jboss.remoting.Client;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.security.SSLSocketBuilder;
+import org.jboss.remoting.transport.http.HTTPMetadataConstants;
import org.jboss.ws.binding.soap.SOAPMessageMarshaller;
import org.jboss.ws.binding.soap.SOAPMessageUnMarshaller;
import org.jboss.ws.jaxrpc.StubExt;
@@ -200,7 +201,7 @@
{
resMessage = (SOAPMessage)remotingClient.invoke(reqMessage, metadata);
}
-
+
// disconnect the rmoting client
remotingClient.disconnect();
@@ -244,7 +245,7 @@
// with a quoted empty string value, if in the corresponding WSDL description,
// the soapAction attribute of soapbind:operation is either not present, or
// present with an empty string as its value.
-
+
MimeHeaders mimeHeaders = reqMessage.getMimeHeaders();
String[] action = mimeHeaders.getHeader("SOAPAction");
if (action != null && action.length > 0)
@@ -266,6 +267,10 @@
reqMessage.saveChanges();
Map<String, Object> metadata = new HashMap<String, Object>();
+
+ // We need to unmarshall faults (HTTP 500)
+ metadata.put(HTTPMetadataConstants.NO_THROW_ON_ERROR, "true");
+
Properties props = new Properties();
metadata.put("HEADER", props);
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java 2006-11-06 19:21:25 UTC (rev 1405)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java 2006-11-07 01:35:50 UTC (rev 1406)
@@ -116,9 +116,6 @@
"</env:Envelope>";
SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
- System.out.println("FIXME: [JBREM-626] Allow unmarshalling of HTTP response with error code 500");
- if (true) return;
-
URL epURL = new URL(endpointURL);
SOAPMessage resMsg = con.call(reqMsg, epURL);
SOAPFault soapFault = resMsg.getSOAPBody().getFault();
@@ -145,13 +142,10 @@
" <faultstring>Endpoint {http://webmethod.jsr181.jaxws.ws.test.jboss.org/}TestEndpointPort does not contain operation meta data for: {http://webmethod.jsr181.jaxws.ws.test.jboss.org/}noWebMethod</faultstring>" +
"</env:Fault>";
- System.out.println("FIXME: [JBREM-626] Allow unmarshalling of HTTP response with error code 500");
- if (true) return;
-
Service service = Service.create(wsdlURL, serviceName);
Dispatch dispatch = service.createDispatch(portName, StreamSource.class, Mode.PAYLOAD);
StreamSource retObj = (StreamSource)dispatch.invoke(new StreamSource(new StringReader(reqPayload)));
Element retEl = DOMUtils.parse(new InputSource(retObj.getReader()));
assertEquals(DOMUtils.parse(expPayload), retEl);
}
-}
+}
\ No newline at end of file
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2006-11-06 19:21:25 UTC (rev 1405)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2006-11-07 01:35:50 UTC (rev 1406)
@@ -126,9 +126,6 @@
public void testInital() throws Exception
{
- System.out.println("FIXME: [JBREM-626] Allow unmarshalling of HTTP response with error code 500");
- if (true) return;
-
String item = initial.addItem("Ice Cream");
assertNull("Expected null, but was: " + item, item);
@@ -138,18 +135,12 @@
public void testReplyTo() throws Exception
{
- System.out.println("FIXME: [JBREM-626] Allow unmarshalling of HTTP response with error code 500");
- if (true) return;
-
String item = replyto.getLastItem();
assertEquals("Ice Cream", item);
}
public void testFaultTo() throws Exception
{
- System.out.println("FIXME: [JBREM-626] Allow unmarshalling of HTTP response with error code 500");
- if (true) return;
-
String lastFault = faultto.getLastFault();
assertEquals("java.lang.IllegalArgumentException: Invalid Value", lastFault);
}
19 years
JBossWS SVN: r1405 - in branches/jbossws-1.0/src/test: . java/org/jboss/test/ws/jaxrpc/jbws1190 java/org/jboss/test/ws/jaxrpc/webserviceref java/org/jboss/test/ws/tools/jbws1080
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-11-06 14:21:25 -0500 (Mon, 06 Nov 2006)
New Revision: 1405
Modified:
branches/jbossws-1.0/src/test/build.xml
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java
Log:
Removed Java 5.0 specific code.
Modified: branches/jbossws-1.0/src/test/build.xml
===================================================================
--- branches/jbossws-1.0/src/test/build.xml 2006-11-06 19:03:56 UTC (rev 1404)
+++ branches/jbossws-1.0/src/test/build.xml 2006-11-06 19:21:25 UTC (rev 1405)
@@ -230,6 +230,7 @@
<javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${test.java.dir}"/>
<exclude name="org/jboss/test/ws/interop/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
<exclude name="org/jboss/test/ws/jaxws/**"/>
<exclude name="org/jboss/test/ws/tools/jsr181/**"/>
<classpath refid="javac.classpath"/>
@@ -251,7 +252,6 @@
<mkdir dir="${build.test.dir}/classes"/>
<javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${build.test.dir}/wstools/java"/>
- <src path="${test.java.dir}"/>
<exclude name="org/jboss/test/ws/interop/**"/>
<classpath refid="javac.classpath"/>
</javac>
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-11-06 19:03:56 UTC (rev 1404)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-11-06 19:21:25 UTC (rev 1405)
@@ -81,7 +81,7 @@
String address = endpoints[0].getAddress();
assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://"));
- assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/"));
+ assertTrue("Expected Port '" + port + "'", address.indexOf(":" + port + "/") > -1);
}
private void assertEquals(final String message, final int expected, final int actual)
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-11-06 19:03:56 UTC (rev 1404)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.java 2006-11-06 19:21:25 UTC (rev 1405)
@@ -34,7 +34,7 @@
{
// Provide logging
private static Logger log = Logger.getLogger(ApplicationClient.class);
-
+
public static InitialContext encCtx;
public static String retStr;
@@ -42,8 +42,8 @@
{
String inStr = args[0];
log.info("echo: " + inStr);
-
- ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+
+ ArrayList ports = new ArrayList();
try
{
ports.add((TestEndpoint)((Service)encCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class));
@@ -54,14 +54,15 @@
log.error("Cannot add port", ex);
throw new JAXRPCException(ex);
}
-
- for (TestEndpoint port : ports)
+
+ for (int i = 0; i < ports.size(); i++)
{
+ TestEndpoint port = (TestEndpoint)ports.get(i);
String outStr = port.echo(inStr);
if (inStr.equals(outStr) == false)
throw new JAXRPCException("Invalid echo return: " + inStr);
}
-
+
retStr = inStr;
}
}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java 2006-11-06 19:03:56 UTC (rev 1404)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.java 2006-11-06 19:21:25 UTC (rev 1405)
@@ -44,7 +44,7 @@
{
log.info("echo: " + inStr);
- ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+ ArrayList ports = new ArrayList();
try
{
InitialContext iniCtx = new InitialContext();
@@ -57,8 +57,9 @@
throw new JAXRPCException(ex);
}
- for (TestEndpoint port : ports)
+ for (int i = 0; i < ports.size(); i++)
{
+ TestEndpoint port = (TestEndpoint)ports.get(i);
String outStr = port.echo(inStr);
if (inStr.equals(outStr) == false)
throw new JAXRPCException("Invalid echo return: " + inStr);
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-11-06 19:03:56 UTC (rev 1404)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.java 2006-11-06 19:21:25 UTC (rev 1405)
@@ -38,14 +38,13 @@
{
// Provide logging
private static Logger log = Logger.getLogger(ServletClient.class);
-
- @Override
+
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
String inStr = req.getParameter("echo");
log.info("doGet: " + inStr);
-
- ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>();
+
+ ArrayList ports = new ArrayList();
try
{
InitialContext iniCtx = new InitialContext();
@@ -57,14 +56,15 @@
log.error("Cannot add port", ex);
throw new JAXRPCException(ex);
}
-
- for (TestEndpoint port : ports)
+
+ for (int i = 0; i < ports.size(); i++)
{
+ TestEndpoint port = (TestEndpoint)ports.get(i);
String outStr = port.echo(inStr);
if (inStr.equals(outStr) == false)
throw new JAXRPCException("Invalid echo return: " + inStr);
}
-
+
res.getWriter().print(inStr);
}
}
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-06 19:03:56 UTC (rev 1404)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2006-11-06 19:21:25 UTC (rev 1405)
@@ -47,7 +47,7 @@
}
catch (IOException e)
{
- assertTrue("Expected error", e.getMessage().contains("'{\"http://www.jboss.org/jbossws-tools\":namespaces}' is expected."));
+ assertTrue("Expected error", e.getMessage().indexOf("'{\"http://www.jboss.org/jbossws-tools\":namespaces}' is expected.") > -1);
}
}
19 years
JBossWS SVN: r1404 - branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2006-11-06 14:03:56 -0500 (Mon, 06 Nov 2006)
New Revision: 1404
Modified:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java
Log:
Removed Java 5.0 annotation.
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-11-06 17:24:14 UTC (rev 1403)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2006-11-06 19:03:56 UTC (rev 1404)
@@ -43,7 +43,6 @@
public static final String MESSAGE = "Success!!";
- @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
ServletOutputStream sos = response.getOutputStream();
19 years
JBossWS SVN: r1403 - in branches/jbossws-1.0: . src/ant src/main/resources/samples/common
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-06 12:24:14 -0500 (Mon, 06 Nov 2006)
New Revision: 1403
Modified:
branches/jbossws-1.0/build.xml
branches/jbossws-1.0/src/ant/build-samples.xml
branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
Log:
Add check for available target container
Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml 2006-11-06 14:54:14 UTC (rev 1402)
+++ branches/jbossws-1.0/build.xml 2006-11-06 17:24:14 UTC (rev 1403)
@@ -70,6 +70,8 @@
<available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/>
<available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/>
+ <available property="jboss.available" file="${jboss.client}/jboss-client.jar"/>
+ <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>
<checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
<checksum file="version.properties" fileext=".md5"/>
@@ -489,6 +491,7 @@
<!-- Deploy jbossws to the server -->
<target name="deploy-jbossws" depends="main" description="Deploy jbossws">
+ <fail message="Not available: ${jboss.client}/jboss-client.jar" unless="jboss.available"/>
<antcall target="deploy-to-server">
<param name="jboss.deploy.home" value="${jboss.jdk15.home}"/>
<param name="jbossws" value="jbossws"/>
@@ -506,6 +509,7 @@
</target>
<target name="deploy-jbossws14" depends="main,module-jars14, module-jars14-assert" description="Deploy jbossws14" if="jboss.jdk14.home">
+ <fail message="Not available: ${jboss.client}/jboss-client.jar" unless="jboss.available"/>
<antcall target="deploy-to-server">
<param name="jboss.deploy.home" value="${jboss.jdk14.home}"/>
<param name="jbossws" value="jbossws14"/>
@@ -535,6 +539,7 @@
<!-- Deploy to Tomcat -->
<target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat">
+ <fail message="Not available: ${tomcat.home}/server/lib/catalina.jar" unless="tomcat.available"/>
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/>
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/>
@@ -619,24 +624,6 @@
<!-- Misc. -->
<!-- ================================================================== -->
- <!-- Clean up all build output -->
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${build.dir}"/>
- </target>
-
- <target name="main" description="Executes the default target (most)." depends="most"/>
-
- <target name="most" description="Builds almost everything." depends="jars"/>
-
- <target name="all" description="Create a distribution zip file"
- depends="build-bin-dist,build-src-dist">
- </target>
-
- <!-- Build the documentation -->
- <target name="build-docs" description="Build the documentation">
- <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/>
- </target>
-
<!-- Build the bin dist -->
<target name="build-bin-dist" description="Build the binary distribution"
depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs">
@@ -727,5 +714,20 @@
<zip destfile="${build.dir}/jbossws-${version.id}-src.zip" basedir="${build.src.dist}"
includes="jbossws-${version.id}/**"/>
</target>
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${build.dir}"/>
+ </target>
+ <target name="build-docs" description="Build the documentation">
+ <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/>
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="jars"/>
+
+ <target name="all" description="Create a distribution zip file"
+ depends="build-bin-dist,build-src-dist">
+ </target>
+
</project>
Modified: branches/jbossws-1.0/src/ant/build-samples.xml
===================================================================
--- branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-06 14:54:14 UTC (rev 1402)
+++ branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-06 17:24:14 UTC (rev 1403)
@@ -35,6 +35,9 @@
<include name="jbossws-jboss-integration.jar"/>
<include name="jbossws-tomcat-integration.jar"/>
</fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="servlet-api.jar"/>
+ </fileset>
</copy>
<!-- samples/common -->
Modified: branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-06 14:54:14 UTC (rev 1402)
+++ branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-06 17:24:14 UTC (rev 1403)
@@ -47,6 +47,9 @@
<property name="jboss.server.lib" value="${jboss.server}/lib"/>
<property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
+ <available property="jboss.available" file="${jboss.client}/jboss-client.jar"/>
+ <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>
+
<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
otherwise and initialize the node0/node1 cluster hostnames to localhost
and ${hostname} by default. If you cannot route multicast traffic between
@@ -105,6 +108,7 @@
</fileset>
<pathelement location="${basedir}/lib/jbossws-jboss-integration.jar"/>
<pathelement location="${basedir}/lib/jbossws-tomcat-integration.jar"/>
+ <pathelement location="${basedir}/lib/servlet-api.jar"/>
</path>
<echo message="jboss.home = ${jboss.home}"/>
@@ -113,9 +117,6 @@
<echo message="node0 = ${node0}"/>
<echo/>
- <available property="jbossws.available" file="${jboss.home}/client/jbossall-client.jar"/>
- <fail message="Not available: ${jboss.home}/client/jbossall-client.jar" unless="jbossws.available"/>
-
<mkdir dir="${build.test.dir}/classes"/>
<mkdir dir="${build.test.dir}/resources"/>
<mkdir dir="${build.test.dir}/reports"/>
19 years
JBossWS SVN: r1402 - in branches/jbossws-1.0/src: main/resources/samples/jaxrpc/mtom test/ant
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-06 09:54:14 -0500 (Mon, 06 Nov 2006)
New Revision: 1402
Modified:
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/build.xml
branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
Log:
Fix mtom samples build
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/build.xml 2006-11-06 14:03:47 UTC (rev 1401)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/build.xml 2006-11-06 14:54:14 UTC (rev 1402)
@@ -34,8 +34,8 @@
<!-- jaxrpc-samples-mtom -->
<war warfile="${build.test.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/>
</classes>
<webinf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-11-06 14:03:47 UTC (rev 1401)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-11-06 14:54:14 UTC (rev 1402)
@@ -1354,7 +1354,8 @@
<!-- jaxrpc-samples-mtom -->
<war warfile="${build.test.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/mtom/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/>
</classes>
<webinf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
19 years
JBossWS SVN: r1401 - in branches/jbossws-1.0: . src/main/resources/samples
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-06 09:03:47 -0500 (Mon, 06 Nov 2006)
New Revision: 1401
Modified:
branches/jbossws-1.0/src/main/resources/samples/ant.properties.example
branches/jbossws-1.0/version.properties
Log:
update version id
Modified: branches/jbossws-1.0/src/main/resources/samples/ant.properties.example
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-06 14:02:29 UTC (rev 1400)
+++ branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-06 14:03:47 UTC (rev 1401)
@@ -2,10 +2,10 @@
#
# Required JBoss Home
-#jboss.jdk15.home=/home/tdiesler/svn/jboss/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.GA-ejb3
+#jboss.jdk15.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
# Optional JBoss Home
-#jboss.jdk14.home=/home/tdiesler/svn/jboss/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
+#jboss.jdk14.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
# The JBoss server instance
jboss.server.instance=default
Modified: branches/jbossws-1.0/version.properties
===================================================================
--- branches/jbossws-1.0/version.properties 2006-11-06 14:02:29 UTC (rev 1400)
+++ branches/jbossws-1.0/version.properties 2006-11-06 14:03:47 UTC (rev 1401)
@@ -5,7 +5,7 @@
specification.vendor=JBoss (http://www.jboss.com)
specification.version=jbossws-1.0
-version.id=1.0.4.DEV
+version.id=1.0.4.GA
repository.id=1.0.4.GA
implementation.title=JBoss Web Services (JBossWS)
19 years
JBossWS SVN: r1400 - in branches/jbossws-1.0/src/test: java/org/jboss/test/ws/jaxrpc/marshall resources/jaxrpc/marshall-rpclit/META-INF resources/jaxrpc/marshall-rpclit/WEB-INF
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2006-11-06 09:02:29 -0500 (Mon, 06 Nov 2006)
New Revision: 1400
Modified:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml
Log:
Fix JBWS-1333
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2006-11-06 13:38:27 UTC (rev 1399)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2006-11-06 14:02:29 UTC (rev 1400)
@@ -303,8 +303,8 @@
{
Call call = service.createCall();
call.setOperationName(new QName(TARGET_NAMESPACE, "base64BinaryTest"));
- call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_BASE64BINARY, primParams.getClass(), ParameterMode.IN);
- call.setReturnType(Constants.TYPE_LITERAL_BASE64BINARY, primParams.getClass());
+ call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_BASE64BINARY, byte[].class, ParameterMode.IN);
+ call.setReturnType(Constants.TYPE_LITERAL_BASE64BINARY, byte[].class);
call.setTargetEndpointAddress(TARGET_ADDRESS);
primParams = (byte[])call.invoke(new Object[] { primParams });
return primParams;
@@ -314,8 +314,8 @@
{
Call call = service.createCall();
call.setOperationName(new QName(TARGET_NAMESPACE, "hexBinaryTest"));
- call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_HEXBINARY, primParams.getClass(), ParameterMode.IN);
- call.setReturnType(Constants.TYPE_LITERAL_HEXBINARY, primParams.getClass());
+ call.addParameter("arrayOfbyte_1", Constants.TYPE_LITERAL_HEXBINARY, byte[].class, ParameterMode.IN);
+ call.setReturnType(Constants.TYPE_LITERAL_HEXBINARY, byte[].class);
call.setTargetEndpointAddress(TARGET_ADDRESS);
primParams = (byte[])call.invoke(new Object[] { primParams });
return primParams;
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2006-11-06 13:38:27 UTC (rev 1399)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2006-11-06 14:02:29 UTC (rev 1400)
@@ -209,9 +209,8 @@
Object out = base64BinaryTest(in);
assertEquals(new String(in), new String((byte[])out));
- System.out.println("FIXME: [JBWS-1333] Fix marshalling of null values in base64Binary, hexBinary");
- //out = base64BinaryTest(null);
- //assertNull(out);
+ out = base64BinaryTest(null);
+ assertNull(out);
}
public void testHexBinary() throws Exception
@@ -220,9 +219,8 @@
byte[] out = hexBinaryTest(in);
assertEquals(new String(in), new String((byte[])out));
- System.out.println("FIXME: [JBWS-1333] Fix marshalling of null values in base64Binary, hexBinary");
- //out = hexBinaryTest(null);
- //assertNull(out);
+ out = hexBinaryTest(null);
+ assertNull(out);
}
public void testCalendar() throws Exception
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2006-11-06 13:38:27 UTC (rev 1399)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2006-11-06 14:02:29 UTC (rev 1400)
@@ -9,6 +9,7 @@
<service-ref>
<service-ref-name>service/StandardTypes</service-ref-name>
+ <config-name>Standard MTOM disabled client</config-name>
<wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-marshall-rpclit?wsdl</wsdl-override>
</service-ref>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2006-11-06 13:38:27 UTC (rev 1399)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2006-11-06 14:02:29 UTC (rev 1400)
@@ -5,7 +5,12 @@
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>
+ <context-param>
+ <param-name>jbossws-config-name</param-name>
+ <param-value>Standard MTOM disabled endpoint</param-value>
+ </context-param>
+
+ <servlet>
<servlet-name>StandardTypes</servlet-name>
<servlet-class>org.jboss.test.ws.jaxrpc.marshall.StandardTypesBean</servlet-class>
</servlet>
19 years
JBossWS SVN: r1399 - branches/jbossws-1.0/src/main/java/org/jboss/ws/server
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-06 08:38:27 -0500 (Mon, 06 Nov 2006)
New Revision: 1399
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
Log:
log jbossws version
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-06 10:20:39 UTC (rev 1398)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-06 13:38:27 UTC (rev 1399)
@@ -600,7 +600,7 @@
public void create() throws Exception
{
- log.info("WebServices: " + UnifiedMetaData.getImplementationVersion());
+ log.info(UnifiedMetaData.getImplementationVersion());
MBeanServer server = getJMXServer();
if (server != null)
{
19 years
JBossWS SVN: r1398 - branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2006-11-06 05:20:39 -0500 (Mon, 06 Nov 2006)
New Revision: 1398
Removed:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java
Log:
Redundant test
Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java 2006-11-06 00:58:44 UTC (rev 1397)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPElementRPCTestCase.java 2006-11-06 10:20:39 UTC (rev 1398)
@@ -1,132 +0,0 @@
-/*
- * 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.jaxrpc.xop;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import javax.mail.internet.ContentType;
-import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.Constants;
-import org.jboss.ws.common.CommonMessageContext;
-import org.jboss.ws.jaxrpc.Style;
-import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC;
-import org.jboss.ws.metadata.OperationMetaData;
-import org.jboss.ws.metadata.ParameterMetaData;
-import org.jboss.ws.soap.MessageContextAssociation;
-import org.jboss.ws.soap.NameImpl;
-import org.jboss.ws.soap.SOAPBodyElementRpc;
-import org.jboss.ws.soap.SOAPContentElement;
-import org.jboss.ws.soap.attachment.MimeConstants;
-import org.jboss.ws.utils.DOMUtils;
-import org.jboss.ws.utils.DOMWriter;
-
-/**
- * Test the SOAPElement
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 17-Jan-2006
- */
-public class XOPElementRPCTestCase extends JBossWSTest
-{
- private OperationMetaData opMetaData;
- private ParameterMetaData paramMetaData;
- private MessageFactory msgFactory;
- private SOAPMessage soapMessage;
- private SOAPContentElement xopElement;
-
- protected void setUp() throws Exception
- {
- super.setUp();
-
- // Setup the opMetaData
- opMetaData = new OperationMetaData(new QName("http://somens", "myOperation", "ns1"), "myOperation");
- opMetaData.getEndpointMetaData().setStyle(Style.RPC);
- paramMetaData = new ParameterMetaData(opMetaData,
- new QName("xopParam"),
- new QName(Constants.NS_XML_MIME, "base64Binary", Constants.PREFIX_XSD),
- "java.lang.String"
- );
- opMetaData.addParameter(paramMetaData);
-
- // Setup XOP element
- msgFactory = MessageFactory.newInstance();
- soapMessage = msgFactory.createMessage();
- SOAPBodyElement bodyElement = new SOAPBodyElementRpc(new NameImpl(opMetaData.getQName()));
- soapMessage.getSOAPBody().addChildElement(bodyElement);
- xopElement = new SOAPContentElement(new NameImpl(paramMetaData.getXmlName()));
- xopElement.setParamMetaData(paramMetaData);
- bodyElement.addChildElement(xopElement);
-
- // Setup the message context
- CommonMessageContext msgContext = new SOAPMessageContextJAXRPC();
- MessageContextAssociation.pushMessageContext(msgContext);
- msgContext.setOperationMetaData(opMetaData);
- msgContext.setSOAPMessage(soapMessage);
-
- }
-
- public void testSOAPMessageRoundTrip() throws Exception
- {
- System.out.println("FIXME: [JBWS-1292] Fix XOPElementRPCTestCase");
- if (true) return;
-
- String xopContent = "This is XOP content";
- //xopElement.setXMimeContentType("text/plain");
- xopElement.setObjectValue(xopContent);
-
- // Write SOAP message as multipart/related
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- soapMessage.writeTo(baos);
- byte[] bytes = baos.toByteArray();
-
- //System.out.println(new String(bytes));
-
- // Verify mime headers
- MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
- ContentType contentType = new ContentType(mimeHeaders.getHeader(MimeConstants.CONTENT_TYPE)[0]);
- assertEquals(MimeConstants.TYPE_MULTIPART_RELATED, contentType.getBaseType());
-
- SOAPMessage soapMessage = msgFactory.createMessage(mimeHeaders, new ByteArrayInputStream(bytes));
-
- SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
- System.out.println(DOMWriter.printNode(soapEnvelope, true));
-
- SOAPBody soapBody = soapMessage.getSOAPBody();
- SOAPElement rpcElement = (SOAPElement)DOMUtils.getFirstChildElement(soapBody);
- assertEquals(new NameImpl(opMetaData.getQName()), rpcElement.getElementName());
- SOAPContentElement xopElement = (SOAPContentElement)DOMUtils.getFirstChildElement(rpcElement);
- assertEquals(new NameImpl(paramMetaData.getXmlName()), xopElement.getElementName());
- xopElement.setParamMetaData(paramMetaData);
- Object retObj = xopElement.getObjectValue();
- assertEquals(xopContent, retObj);
- }
-}
\ No newline at end of file
19 years
JBossWS SVN: r1397 - branches/jbossws-1.0
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-05 19:58:44 -0500 (Sun, 05 Nov 2006)
New Revision: 1397
Modified:
branches/jbossws-1.0/build.xml
Log:
remove jboss-ejb3-client available check
Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml 2006-11-06 00:09:36 UTC (rev 1396)
+++ branches/jbossws-1.0/build.xml 2006-11-06 00:58:44 UTC (rev 1397)
@@ -69,7 +69,6 @@
<echo/>
<available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/>
- <available property="jboss.ejb3.available" file="${jboss.client}/jboss-ejb3-client.jar"/>
<available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/>
<checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
@@ -84,8 +83,6 @@
</or>
</condition>
- <fail message="Not available: ${jboss.client}/jboss-ejb3-client.jar" unless="jboss.ejb3.available"/>
-
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
@@ -269,6 +266,7 @@
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/jboss/**"/>
<exclude name="org/jboss/ws/integration/tomcat/**"/>
+ <exclude name="org/jboss/ws/transport/jms/**"/>
</fileset>
<fileset dir="${build.resources.dir}/jbossws.sar">
<include name="META-INF/standard-jaxrpc-client-config.xml"/>
@@ -391,6 +389,7 @@
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/jboss/**"/>
<exclude name="org/jboss/ws/integration/tomcat/**"/>
+ <exclude name="org/jboss/ws/transport/jms/**"/>
</fileset>
<fileset dir="${build.resources.dir}/jbossws.sar">
<include name="META-INF/standard-jaxrpc-client-config.xml"/>
19 years