r1283 - in xwiki-clients/p2pxwiki: resources src/main/java/com/xpn/p2pxwiki/communication/jxtarpc src/main/java/com/xpn/p2pxwiki/communication/xmlrpc src/test/java/com/xpn/p2pxwiki/communication
Sergiu Dumitriu
sdumitriu at users.forge.objectweb.org
Tue Sep 5 13:46:28 CEST 2006
Author: sdumitriu
Date: 2006-09-05 13:46:27 +0200 (Tue, 05 Sep 2006)
New Revision: 1283
Added:
xwiki-clients/p2pxwiki/src/test/java/com/xpn/p2pxwiki/communication/Try.java
Modified:
xwiki-clients/p2pxwiki/resources/log4j.properties
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/jxtarpc/JxtaRpcNetwork.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/xmlrpc/XmlRpcNetwork.java
xwiki-clients/p2pxwiki/src/test/java/com/xpn/p2pxwiki/communication/AbstractLocalTest.java
Log:
Bug found in JxtaRpcLocalTest - Try.java exhibits the bug. P2PWebServer works while P2PServletWebServer does not.
Modified: xwiki-clients/p2pxwiki/resources/log4j.properties
===================================================================
--- xwiki-clients/p2pxwiki/resources/log4j.properties 2006-09-05 11:24:31 UTC (rev 1282)
+++ xwiki-clients/p2pxwiki/resources/log4j.properties 2006-09-05 11:46:27 UTC (rev 1283)
@@ -11,4 +11,5 @@
log4j.logger.com.xpn.p2pxwiki=debug
log4j.logger.org.apache.commons.httpclient=warn
-log4j.logger.org.p2psockets=info
\ No newline at end of file
+log4j.logger.org.p2psockets=info
+log4j.logger.org.apache.xmlrpc=debug
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/jxtarpc/JxtaRpcNetwork.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/jxtarpc/JxtaRpcNetwork.java 2006-09-05 11:24:31 UTC (rev 1282)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/jxtarpc/JxtaRpcNetwork.java 2006-09-05 11:46:27 UTC (rev 1283)
@@ -22,7 +22,7 @@
public JxtaRpcNetwork() throws P2PXWikiException {
log.debug("constructor");
}
-
+
public void init() throws P2PXWikiException {
log.debug("init");
try {
@@ -38,7 +38,7 @@
protected ServletWebServer createServletWebServer(XmlRpcServlet servlet)
throws ServletException, IOException {
- log.debug("Creating P2PServletWebServer");
+ log.debug("Creating P2PServletWebServer at port:"+getServerPort());
ServletWebServer newServer = new P2PServletWebServer(servlet, getServerPort());
log.debug("Starting P2PServletWebServer");
newServer.start();
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/xmlrpc/XmlRpcNetwork.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/xmlrpc/XmlRpcNetwork.java 2006-09-05 11:24:31 UTC (rev 1282)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/xmlrpc/XmlRpcNetwork.java 2006-09-05 11:46:27 UTC (rev 1283)
@@ -46,7 +46,7 @@
protected ServletWebServer createServletWebServer(XmlRpcServlet servlet)
throws ServletException, IOException {
- log.debug("Creating ServletWebServer");
+ log.debug("Creating ServletWebServer at port:"+getServerPort());
ServletWebServer newServer = new ServletWebServer(servlet, getServerPort());
log.debug("Starting ServletWebServer");
newServer.start();
Modified: xwiki-clients/p2pxwiki/src/test/java/com/xpn/p2pxwiki/communication/AbstractLocalTest.java
===================================================================
--- xwiki-clients/p2pxwiki/src/test/java/com/xpn/p2pxwiki/communication/AbstractLocalTest.java 2006-09-05 11:24:31 UTC (rev 1282)
+++ xwiki-clients/p2pxwiki/src/test/java/com/xpn/p2pxwiki/communication/AbstractLocalTest.java 2006-09-05 11:46:27 UTC (rev 1283)
@@ -39,7 +39,7 @@
public void setUp() throws Exception {
localPeer = getLocalPeer();
remotePeer = getRemotePeer();
- port = 3483;
+ port = 9099;
config = new XWikiConfig();
config.put("xwiki.store.cache", "0");
@@ -49,44 +49,20 @@
config.put(AbstractNetwork.CONNECTOR_FACTORY, getConnectionFactory());
xcontext = new XWikiContext();
- xwiki = new XWiki(config, xcontext) {
- @Override
- public void initXWiki(XWikiConfig config, XWikiContext context, XWikiEngineContext engine_context, boolean noupdate) throws XWikiException {
- context.setWiki(this);
- setConfig(config);
- // super.initXWiki(config, context, engine_context, noupdate);
- }
- };
+ xwiki = new XWiki(config, xcontext);
xcontext.setWiki(xwiki);
plugin = new ConnectorPlugin(ConnectorPlugin.PLUGIN_NAME, ConnectorPlugin.class.getName(), xcontext);
-
-// config1 = new XWikiConfig();
-// config1.put("xwiki.store.cache", "0");
-// config1.put(AbstractNetwork.PEER_NAME, remotePeer);
-// config1.put(AbstractNetwork.SERVER_PORT, (new Integer(port)).toString());
-// config1.put(ConnectorPlugin.NETWORK_TYPE, getNetwork());
-// config1.put(AbstractNetwork.CONNECTOR_FACTORY, getConnectionFactory());
-//
-// xcontext1 = new XWikiContext();
-// xwiki1 = xwiki;
-//// gnu.getopt = new XWiki(config1, xcontext1) {
-//// public void initXWiki(XWikiConfig config, XWikiContext context, XWikiEngineContext engine_context, boolean noupdate) throws XWikiException {
-//// context.setWiki(this);
-//// setConfig(config);
-//// // super.initXWiki(config, context, engine_context, noupdate);
-//// }
-//// };
-// //xwiki1 = null;//new XWiki(config1, xcontext1);
-// xcontext1.setWiki(xwiki1);
-//
-// plugin1 = new ConnectorPlugin(ConnectorPlugin.PLUGIN_NAME, ConnectorPlugin.class.getName(), xcontext1);
}
public void tearDown() throws Exception {
plugin.closeConnection(stub);
plugin.cleanup();
- P2PNetwork.signOff();
+ try {
+ P2PNetwork.signOff();
+ } catch (RuntimeException ignore) {
+
+ }
}
public void test() throws P2PXWikiException {
Added: xwiki-clients/p2pxwiki/src/test/java/com/xpn/p2pxwiki/communication/Try.java
===================================================================
--- xwiki-clients/p2pxwiki/src/test/java/com/xpn/p2pxwiki/communication/Try.java 2006-09-05 11:24:31 UTC (rev 1282)
+++ xwiki-clients/p2pxwiki/src/test/java/com/xpn/p2pxwiki/communication/Try.java 2006-09-05 11:46:27 UTC (rev 1283)
@@ -0,0 +1,57 @@
+package com.xpn.p2pxwiki.communication;
+
+import java.net.URL;
+
+import org.apache.xmlrpc.client.P2PXmlRpcLiteHttpTransportFactory;
+import org.apache.xmlrpc.client.XmlRpcClient;
+import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
+import org.apache.xmlrpc.server.PropertyHandlerMapping;
+import org.apache.xmlrpc.server.XmlRpcServer;
+import org.apache.xmlrpc.webserver.P2PServletWebServer;
+import org.apache.xmlrpc.webserver.P2PWebServer;
+import org.apache.xmlrpc.webserver.WebServer;
+import org.p2psockets.P2PNetwork;
+
+import com.xpn.p2pxwiki.mocks.HelloHandler;
+import com.xpn.xwiki.XWiki;
+import com.xpn.xwiki.XWikiConfig;
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.xmlrpc.XWikiXmlRpcServlet;
+
+// TODO: this code has a bug somewhere
+public class Try {
+ public static void main(String[] args) throws Exception {
+// not relevant - only for logging
+ XWikiConfig xconfig = new XWikiConfig();
+
+ XWikiContext xcontext = new XWikiContext();
+ XWiki xwiki = new XWiki(xconfig, xcontext);
+ xcontext.setWiki(xwiki);
+// end not relevant
+
+ P2PNetwork.autoSignin("localPeer", "JXTA:P2PXWikiNetwork");
+// works
+// WebServer webServer = new P2PWebServer(9090);
+// PropertyHandlerMapping phm = new PropertyHandlerMapping();
+// phm.addHandler("hello_handler", HelloHandler.class);
+//
+// XmlRpcServer xmlRpcServer = webServer.getXmlRpcServer();
+// xmlRpcServer.setHandlerMapping(phm);
+
+
+// does not work
+ WebServer webServer = new P2PServletWebServer(new XWikiXmlRpcServlet(), 9090);
+
+ webServer.start();
+ System.out.println("Server Started");
+
+ XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
+ config.setServerURL(new URL("http://www.localPeer.peer:9090"));
+ XmlRpcClient client = new XmlRpcClient();
+ client.setTransportFactory(new P2PXmlRpcLiteHttpTransportFactory(client)); // new XmlRpcCommonsTransportFactory(client)
+ client.setConfig(config);
+ Object[] params = new Object[]{"world"};
+ System.out.println("Client Executing");
+ System.out.println(client.execute("hello_handler.hello", params));
+ }
+}
More information about the Xwiki-notifications
mailing list