diff options
author | slewis | 2014-02-15 22:22:31 +0000 |
---|---|---|
committer | slewis | 2014-02-15 22:22:31 +0000 |
commit | 4cc467ce666d98d9d5c888e48284ceeafd0a132f (patch) | |
tree | b3de73db67e9d1e1327b8fa161833a76cd439d8c /tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc | |
parent | 5b2dc1813e83473b0f645be329cd1e450c12ebf9 (diff) | |
parent | 7f9707d0d9cd1187a8883a2f1e1cd48fcdc700ef (diff) | |
download | org.eclipse.ecf-4cc467ce666d98d9d5c888e48284ceeafd0a132f.tar.gz org.eclipse.ecf-4cc467ce666d98d9d5c888e48284ceeafd0a132f.tar.xz org.eclipse.ecf-4cc467ce666d98d9d5c888e48284ceeafd0a132f.zip |
Merge remote-tracking branch 'origin/master' into rfc1.1
Conflicts:
tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceConsumerExample1Template.class
tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceHostExample1Template.class
Change-Id: Ie21398ea7d984d7950e08cefabba72467fa3c2b8
Diffstat (limited to 'tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc')
-rw-r--r-- | tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/internal/tests/remoteservice/rpc/Activator.java | 56 |
1 files changed, 50 insertions, 6 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/internal/tests/remoteservice/rpc/Activator.java b/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/internal/tests/remoteservice/rpc/Activator.java index 51121943d..efe647b02 100644 --- a/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/internal/tests/remoteservice/rpc/Activator.java +++ b/tests/bundles/org.eclipse.ecf.tests.remoteservice.rpc/src/org/eclipse/ecf/internal/tests/remoteservice/rpc/Activator.java @@ -9,16 +9,28 @@ *******************************************************************************/ package org.eclipse.ecf.internal.tests.remoteservice.rpc; -import org.eclipse.equinox.http.jetty.JettyConfigurator; +import javax.servlet.ServletConfig; +import org.apache.xmlrpc.XmlRpcConfig; +import org.apache.xmlrpc.server.XmlRpcHandlerMapping; +import org.apache.xmlrpc.webserver.XmlRpcServletServer; +import java.io.InputStream; +import java.io.ByteArrayOutputStream; +import java.io.BufferedInputStream; +import java.io.InputStreamReader; +import java.io.StringReader; +import javax.servlet.ServletInputStream; +import java.util.Enumeration; +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServlet; +import org.eclipse.equinox.http.jetty.JettyConfigurator; import java.util.Hashtable; - import java.util.Dictionary; - import org.apache.xmlrpc.webserver.XmlRpcServlet; - import org.eclipse.ecf.tests.remoteservice.rpc.RpcConstants; - import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -36,13 +48,45 @@ public class Activator implements BundleActivator { return context; } + class XHttpServlet extends HttpServlet { + + private final XmlRpcServlet s = new XmlRpcServlet(); + + @Override + public void init(ServletConfig config) throws ServletException { + // TODO Auto-generated method stub + super.init(config); + s.init(config); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + //System.out.println("doPost req="+readInputStreamAsString(req.getInputStream())); + s.doPost(req,resp); + } + } + + public static String readInputStreamAsString(InputStream in) + throws IOException { + + BufferedInputStream bis = new BufferedInputStream(in); + ByteArrayOutputStream buf = new ByteArrayOutputStream(); + int result = bis.read(); + while(result != -1) { + byte b = (byte)result; + buf.write(b); + result = bis.read(); + } + return buf.toString(); + } /* * (non-Javadoc) * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) */ public void start(BundleContext bundleContext) throws Exception { Activator.context = bundleContext; - httpServiceConnector = new HttpServiceConnector(context, RpcConstants.TEST_SERVLETS_PATH, new XmlRpcServlet()); + httpServiceConnector = new HttpServiceConnector(context, RpcConstants.TEST_SERVLETS_PATH, new XHttpServlet()); Dictionary<String, Object> properties = new Hashtable<String, Object>(); properties.put(HTTP_PORT_KEY, RpcConstants.HTTP_PORT); |