[jboss-svn-commits] JBL Code SVN: r26907 - labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/test.

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2009-06-10 09:45:53 -0400 (Wed, 10 Jun 2009)
New Revision: 26907

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/test/SendMessage.java
Log:
https://jira.jboss.org/jira/browse/JBESB-2612
Reversing original mods.  No longer required.

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/test/SendMessage.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/test/SendMessage.java	2009-06-10 13:41:41 UTC (rev 26906)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/webservice_producer/src/org/jboss/soa/esb/samples/quickstart/webserviceproducer/test/SendMessage.java	2009-06-10 13:45:53 UTC (rev 26907)
@@ -21,15 +21,8 @@
 package org.jboss.soa.esb.samples.quickstart.webserviceproducer.test;
 
 import org.jboss.internal.soa.esb.util.StreamUtils;
-import org.jboss.internal.soa.esb.remoting.HttpMarshaller;
-import org.jboss.internal.soa.esb.remoting.HttpUnmarshaller;
 import org.jboss.remoting.InvokerLocator;
 import org.jboss.remoting.Client;
-import org.jboss.remoting.serialization.SerializationStreamFactory;
-import org.jboss.remoting.marshal.MarshalFactory;
-import org.jboss.remoting.marshal.UnMarshaller;
-import org.jboss.remoting.marshal.http.HTTPMarshaller;
-import org.jboss.remoting.marshal.http.HTTPUnMarshaller;
 
 import javax.jms.JMSException;
 import javax.jms.ObjectMessage;
@@ -40,11 +33,6 @@
 import javax.jms.QueueSession;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import java.net.InetAddress;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.util.Map;
 
 import org.jboss.soa.esb.actions.StoreMessageToFile;
 
@@ -121,9 +109,6 @@
     	SendMessage sm = new SendMessage();
         String msg = getMessage("01");
 
-        // Set the marshallers. See See https://jira.jboss.org/jira/browse/JBESB-2612
-        MarshalFactory.addMarshaller(HTTPMarshaller.DATATYPE, new HTTPMarshaller(), new JBRServerHttpUnmarshaller());
-
         String protocol = args[0];
         if(protocol.equals("jms")) {
             sm.sendMessageOverJMS(msg);
@@ -131,21 +116,4 @@
             sm.sendMessageToJBRListener(protocol, Integer.parseInt(args[1]), msg);
         }
     }
-
-    /**
-     * See https://jira.jboss.org/jira/browse/JBESB-2612 
-     */
-    public static class JBRServerHttpUnmarshaller extends HTTPUnMarshaller {
-        public Object read(InputStream inputStream, Map metadata, int version) throws IOException, ClassNotFoundException {
-            // We know we are talking to a JBR Server and that it will return an InvocationResponse...
-            ObjectInputStream ois = (ObjectInputStream) getMarshallingStream(inputStream, null);
-            return SerializationStreamFactory.getManagerInstance(getSerializationType()).receiveObject(ois, customClassLoader, version);
-        }
-
-        public UnMarshaller cloneUnMarshaller() throws CloneNotSupportedException {
-            JBRServerHttpUnmarshaller clone = new JBRServerHttpUnmarshaller();
-            clone.setClassLoader(customClassLoader);
-            return clone;
-        }
-    }
 }