r1175 - in xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki: client communication communication/rpc registry replication rpc utils
Sergiu Dumitriu
sdumitriu at users.forge.objectweb.org
Sat Aug 19 21:07:11 CEST 2006
Author: sdumitriu
Date: 2006-08-19 21:07:09 +0200 (Sat, 19 Aug 2006)
New Revision: 1175
Added:
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcConnectionFactory.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcHandlerManager.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcHandlerStub.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcNetwork.java
Removed:
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicHandlerManager.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicNetwork.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicRemoteConnectionFactory.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/Network.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerManager.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerStub.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcRemoteConnectionFactory.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/jxta/
Modified:
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiBaseClient.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiException.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRPCClient.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClient.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClientApi.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClientPlugin.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClient.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClientApi.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClientPlugin.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/ConnectorPlugin.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/HandlerManagerInterface.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/HandlerStub.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/registry/P2PXWikiRegistryHandlerPlugin.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/replication/P2PXWikiReplicationHandler.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/replication/P2PXWikiReplicationHandlerPlugin.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/rpc/P2PXWikiConfluenceRpcHandler.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/rpc/P2PXWikiRPCHandlerPlugin.java
xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/utils/P2PXWikiEngineContext.java
Log:
Clean up work: got rid of all warnings. Renaming to shorter names (part 1).
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiBaseClient.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiBaseClient.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiBaseClient.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -1,8 +1,5 @@
package com.xpn.p2pxwiki.client;
-import java.util.Hashtable;
-import java.util.Vector;
-
import com.xpn.p2pxwiki.communication.ConnectorPlugin;
import com.xpn.p2pxwiki.communication.HandlerStub;
import com.xpn.xwiki.XWikiContext;
@@ -10,7 +7,6 @@
public class P2PXWikiBaseClient {
protected XWikiContext context;
-
public P2PXWikiBaseClient(XWikiContext context){
this.context = context;
}
@@ -27,13 +23,10 @@
public String login(String username, String password, String wikiserver,
String serverHandlerClass) {
HandlerStub client = getConnection(wikiserver);
- Vector args = new Vector();
try {
- args.add(username);
- args.add(password);
- args.add(""); /* default database to use on the server */
+ String database = ""; /* default database to use on the server */
String result = (String) client.execute(serverHandlerClass
- + ".login", args);
+ + ".login", new Object[] {username, password, database});
if (result.length() == 0){
return null;
}
@@ -45,13 +38,11 @@
}
public boolean logout(String token, String wikiserver, String serverHandlerClass) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(""); /* default database to use on the server */
+ String database = ""; /* default database to use on the server */
Boolean result = (Boolean) client.execute(serverHandlerClass
- + ".logout", args);
+ + ".logout", new Object[] {token, database});
return result.booleanValue();
} catch (Exception e) {
e.printStackTrace();
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiException.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiException.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiException.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -3,6 +3,7 @@
import com.xpn.xwiki.plugin.PluginException;
public class P2PXWikiException extends PluginException {
+ private static final long serialVersionUID = 1106138323477622364L;
public static final int ERROR_P2PXWIKI_COMMUNICATION = 30999;
public static final int ERROR_P2PXWIKI_REMOTECALL = 30998;
static String module = "P2PXWiki";
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRPCClient.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRPCClient.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRPCClient.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -32,12 +32,10 @@
}
public Vector getSpaces(String token, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
Vector result = (Vector) client.execute(
- HANDLERCLASS + ".getSpaces", args);
+ HANDLERCLASS + ".getSpaces", new Object[] {token});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -46,13 +44,10 @@
}
public Hashtable getSpace(String token, String spaceKey, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(spaceKey);
Hashtable result = (Hashtable) client.execute(HANDLERCLASS
- + ".getSpace", args);
+ + ".getSpace", new Object[] {token, spaceKey});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -61,13 +56,10 @@
}
public Vector getPages(String token, String spaceKey, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(spaceKey);
Vector result = (Vector) client.execute(HANDLERCLASS + ".getPages",
- args);
+ new Object[] {token, spaceKey});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -76,13 +68,10 @@
}
public Hashtable getPage(String token, String pageId, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(pageId);
Hashtable result = (Hashtable) client.execute(HANDLERCLASS
- + ".getPage", args);
+ + ".getPage", new Object[] {token, pageId});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -91,13 +80,10 @@
}
public Vector getPageHistory(String token, String pageId, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(pageId);
Vector result = (Vector) client.execute(HANDLERCLASS
- + ".getPageHistory", args);
+ + ".getPageHistory", new Object[] {token, pageId});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -107,13 +93,10 @@
public Vector search(String token, String query, int maxResults,
String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(query);
Vector result = (Vector) client.execute(HANDLERCLASS + ".search",
- args);
+ new Object[] {token, query});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -123,15 +106,10 @@
public String renderContent(String token, String spaceKey, String pageId,
String content, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(spaceKey);
- args.add(pageId);
- args.add(content);
String result = (String) client.execute(HANDLERCLASS
- + ".renderContent", args);
+ + ".renderContent", new Object[] {token, spaceKey, pageId, content});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -140,13 +118,10 @@
}
public Vector getAttachments(String token, String pageId, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(pageId);
Vector result = (Vector) client.execute(HANDLERCLASS
- + ".getAttachments", args);
+ + ".getAttachments", new Object[] {token, pageId});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -155,13 +130,10 @@
}
public Vector getComments(String token, String pageId, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(pageId);
Vector result = (Vector) client.execute(HANDLERCLASS
- + ".getComments", args);
+ + ".getComments", new Object[] {token, pageId});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -170,13 +142,10 @@
}
public Hashtable storePage(String token, Hashtable pageht, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(pageht);
Hashtable result = (Hashtable) client.execute(HANDLERCLASS
- + ".storePage", args);
+ + ".storePage", new Object[] {token, pageht});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -185,12 +154,9 @@
}
public void deletePage(String token, String pageId, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(pageId);
- client.execute(HANDLERCLASS + ".deletePage", args);
+ client.execute(HANDLERCLASS + ".deletePage", new Object[] {token, pageId});
return;
} catch (Exception e) {
e.printStackTrace();
@@ -199,13 +165,10 @@
}
public Hashtable getUser(String token, String username, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(username);
Hashtable result = (Hashtable) client.execute(HANDLERCLASS
- + ".getUser", args);
+ + ".getUser", new Object[] {token, username});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -215,13 +178,9 @@
public void addUser(String token, Hashtable user, String password,
String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(user);
- args.add(password);
- client.execute(HANDLERCLASS + ".addUser", args);
+ client.execute(HANDLERCLASS + ".addUser", new Object[] {token, user, password});
return;
} catch (Exception e) {
e.printStackTrace();
@@ -230,12 +189,9 @@
}
public void addGroup(String token, String group, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(group);
- client.execute(HANDLERCLASS + ".addGroup", args);
+ client.execute(HANDLERCLASS + ".addGroup", new Object[] {token, group});
return;
} catch (Exception e) {
e.printStackTrace();
@@ -244,13 +200,10 @@
}
public Vector getUserGroups(String token, String username, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(username);
Vector result = (Vector) client.execute(HANDLERCLASS
- + ".getUserGroups", args);
+ + ".getUserGroups", new Object[] {token, username});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -260,14 +213,11 @@
public void addUserToGroup(String token, String username, String groupname,
String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(token);
- args.add(username);
- args.add(groupname);
- Integer result = (Integer) client.execute(HANDLERCLASS
- + ".addUserToGroup", args);
+ // FIXME Integer result = (Integer)
+ client.execute(HANDLERCLASS
+ + ".addUserToGroup", new Object[] {token, username, groupname});
return;
} catch (Exception e) {
e.printStackTrace();
@@ -276,11 +226,10 @@
}
public Vector getAllPages(String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
Vector result = (Vector) client.execute(HANDLERCLASS
- + ".getAllPages", args);
+ + ".getAllPages", new Object[] {});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -289,12 +238,10 @@
}
public byte[] getPage(String name, String wikiserver) {
- Vector args = new Vector();
HandlerStub client = getConnection(wikiserver);
try {
- args.add(name);
byte[] result = (byte[]) client.execute(HANDLERCLASS + ".getPage",
- args);
+ new Object[] {name});
return result;
} catch (Exception e) {
e.printStackTrace();
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClient.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClient.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClient.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -1,7 +1,5 @@
package com.xpn.p2pxwiki.client;
-import java.util.Vector;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,18 +29,14 @@
public boolean updateRegistry(String token, String wikiname, String IP) {
/*
- * @TODO Talk to the jxta network and find out the registry and update
+ * TODO Talk to the jxta network and find out the registry and update
* the IP of the master wiki, the registry will then check user exists,
* password is correct, check wiki exists, then update the IP
*/
HandlerStub client = getConnection(P2PXWIKIREGISTRYADDRESS);
- Vector args = new Vector();
try {
- args.add(token);
- args.add(wikiname);
- args.add(IP);
Boolean res = (Boolean) client.execute(HANDLERCLASS
- + ".updateRegistry", args);
+ + ".updateRegistry", new Object[] {token, wikiname, IP});
return res.booleanValue();
} catch (Exception e) {
e.printStackTrace();
@@ -50,10 +44,10 @@
return false;
}
- /* @TODO Api to check a user is going offline and updating the IP */
+ /* TODO Api to check a user is going offline and updating the IP */
/*
- * @TODO Apis to update the IP of a masterwiki because user is moving to a
+ * TODO Apis to update the IP of a masterwiki because user is moving to a
* new place on a per wiki basis (which checks that the user is infact the
* master) and contacts the registry All the APIs below are going to be
* JXTA-RPC/RMI. A first cut will be local update assuming we are working at
@@ -65,7 +59,7 @@
}
/*
- * @TODO Assuming that every user machine has a unique single instance of
+ * TODO Assuming that every user machine has a unique single instance of
* p2pxwiki, this means the user name can be used to migrate all locally
* hosted Wiki to new IP in the registry make sure that only the registry
* has the other database and its associated mapping. One way is to make two
@@ -76,7 +70,7 @@
* public int updateAllMastersIPbyUser(String token, String IP) { return 0; }
*/
/*
- * @TODO This version of the update API allows to migrate a set of wikis
+ * TODO This version of the update API allows to migrate a set of wikis
* which were already in an old ip, and owned by the master, to a new IP
*/
/*
@@ -86,13 +80,11 @@
public String queryRegistry(String wikiname) {
HandlerStub client = getConnection(P2PXWIKIREGISTRYADDRESS);
- Vector args = new Vector();
log.error("Going to query for wikiname:"+ wikiname+" using registry:"+
P2PXWIKIREGISTRYADDRESS);
try {
- args.add(wikiname);
String res = (String) client.execute(HANDLERCLASS
- + ".queryRegistry", args);
+ + ".queryRegistry", new Object[] {wikiname});
return res;
} catch (Exception e) {
e.printStackTrace();
@@ -102,11 +94,9 @@
public boolean existsWikiapp(String wikiapp) {
HandlerStub client = getConnection(P2PXWIKIREGISTRYADDRESS);
- Vector args = new Vector();
try {
- args.add(wikiapp);
boolean res = ((Boolean) client.execute(HANDLERCLASS
- + ".existsWikiapp", args)).booleanValue();
+ + ".existsWikiapp", new Object[] {wikiapp})).booleanValue();
return res;
} catch (Exception e) {
e.printStackTrace();
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClientApi.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClientApi.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClientApi.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -4,14 +4,11 @@
import com.xpn.xwiki.api.Api;
public class P2PXWikiRegistryClientApi extends Api {
- private XWikiContext context;
-
private P2PXWikiRegistryClient regClient = null;
public P2PXWikiRegistryClientApi(XWikiContext context) {
super(context);
regClient = new P2PXWikiRegistryClient(context);
- this.context = context;
}
/* public apis which can be accessed through a webpage */
@@ -27,7 +24,7 @@
return regClient.queryRegistry(wikiname);
}
- /* todo: add apis to create a user and create a wiki */
+ /* TODO: add apis to create a user and create a wiki */
public String login(String username, String password) {
return regClient.login(username, password);
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClientPlugin.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClientPlugin.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiRegistryClientPlugin.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -19,7 +19,7 @@
/*
* virtual address of the registry server, this is used to search in the p2p
- * network by p2psockets
+ * network by p2psockets -- FIXME Comment for what?
*/
public P2PXWikiRegistryClientPlugin(String name, String className,
XWikiContext context) {
@@ -43,6 +43,7 @@
}
public void init(XWikiContext context) {
+ log.debug("initializing");
super.init(context);
// P2PXWikiRegistryClientExamples example = new P2PXWikiRegistryClientExamples();
// example.run();
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClient.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClient.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClient.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -47,13 +47,10 @@
/* @TODO: all these calls should take a wikiapp to replicate as an argument */
public Vector getAllPagesAsXML(String token, String peerserver, String wikiapp) {
- Vector args = new Vector();
HandlerStub client = getConnection(peerserver);
try {
- args.add(token);
- args.add(wikiapp);
Vector result = (Vector) client.execute(HANDLERCLASS
- + ".getAllPagesAsXML", args);
+ + ".getAllPagesAsXML", new Object[] {token, wikiapp});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -67,14 +64,10 @@
/* date is in MMDDYYYY format */
public Vector getAllPagesModifiedSinceAsXML(String token, String date,
String peerserver, String wikiapp) {
- Vector args = new Vector();
HandlerStub client = getConnection(peerserver);
try {
- args.add(token);
- args.add(date);
- args.add(wikiapp);
Vector result = (Vector) client.execute(HANDLERCLASS
- + ".getAllPagesModifiedSinceAsXML", args);
+ + ".getAllPagesModifiedSinceAsXML", new Object[] {token, date, wikiapp});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -84,14 +77,11 @@
public Vector getAllPagesModifiedSinceAsXML(String token, long sinceWhen,
String peerserver, String wikiapp) {
- Vector args = new Vector();
HandlerStub client = getConnection(peerserver);
try {
- args.add(token);
- args.add(new Long(sinceWhen));
- args.add(wikiapp);
Vector result = (Vector) client.execute(HANDLERCLASS
- + ".getAllPagesModifiedSinceAsXML", args);
+ + ".getAllPagesModifiedSinceAsXML",
+ new Object[] {token, new Long(sinceWhen), wikiapp});
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -101,35 +91,30 @@
public Vector getAllPagesModifiedSinceAsXML(String token, Date date,
String peerserver, String wikiapp) {
- Vector args = new Vector();
+
HandlerStub client = getConnection(peerserver);
try {
- args.add(token);
- args.add(date);
- args.add(wikiapp);
Vector result = (Vector) client.execute(HANDLERCLASS
- + ".getAllPagesModifiedSinceAsXML", args);
+ + ".getAllPagesModifiedSinceAsXML", new Object[] {token, date, wikiapp});
return result;
} catch (Exception e) {
e.printStackTrace();
}
return new Vector();
}
+
public boolean replicatePageFromXML(String token, String docXML, String peerserver, String wikiapp) {
- Vector args = new Vector();
HandlerStub client = getConnection(peerserver);
try {
- args.add(token);
- args.add(docXML);
- args.add(wikiapp);
boolean result = ((Boolean) client.execute(HANDLERCLASS
- + ".replicatePageFromXML", args)).booleanValue();
+ + ".replicatePageFromXML", new Object[] {token, docXML, wikiapp})).booleanValue();
return result;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
+
/* api to replicate locally */
public boolean replicatePageFromXML(String token, String docsXML, String wikiapp) {
String peerserver = ConnectorPlugin.getNetwork().getCanonicalLocalName();
@@ -137,7 +122,7 @@
log.error("error in getting local JXTA server address: ---ERRROR --- ") ;
return false;
}
- log.error("connecting to local peer:"+ peerserver+" for replication");
+ log.debug("connecting to local peer:"+ peerserver+" for replication");
return replicatePageFromXML(token,docsXML, peerserver, wikiapp);
}
@@ -151,6 +136,7 @@
log.error("connecting to local peer:"+ peerserver+" for replication");
return replicateAllPagesFromXML(token,docsXML, peerserver, wikiapp);
}
+
/*
* @EXTENSION: This api has future and testing purpose use when the
* replication can be done at another wiki as well
@@ -160,15 +146,12 @@
*/
public boolean replicateAllPagesFromXML(String token, Vector docsXML,
String peerserver, String wikiapp) {
- Vector args = new Vector();
log.error("calling replication for "+ peerserver+" and wikiapp "+wikiapp);
HandlerStub client = getConnection(peerserver);
try {
- args.add(token);
- args.add(docsXML);
- args.add(wikiapp);
boolean result = ((Boolean) client.execute(HANDLERCLASS
- + ".replicateAllPagesFromXML", args)).booleanValue();
+ + ".replicateAllPagesFromXML",
+ new Object[] {token, docsXML, wikiapp})).booleanValue();
return result;
} catch (Exception e) {
e.printStackTrace();
@@ -193,8 +176,6 @@
return replicateAllPagesFromXML(desttoken,allPages,destwiki);
}
-
-
public boolean replicateAllPagesModifiedSinceAsXML(String srctoken,
String srcpeer, String srcwiki, String sinceDate, String desttoken,
String destpeer, String destwiki) {
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClientApi.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClientApi.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClientApi.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -7,13 +7,10 @@
import com.xpn.xwiki.api.Api;
public class P2PXWikiReplicationClientApi extends Api {
- private XWikiContext context;
-
private P2PXWikiReplicationClient repClient = null;
public P2PXWikiReplicationClientApi(XWikiContext context) {
super(context);
- this.context = context;
if (repClient == null)
repClient = new P2PXWikiReplicationClient(context);
}
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClientPlugin.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClientPlugin.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/client/P2PXWikiReplicationClientPlugin.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -36,6 +36,7 @@
public void init(XWikiContext context) {
super.init(context);
+ log.debug("initializing");
// P2PXWikiReplicationClientExamples examples = new P2PXWikiReplicationClientExamples();
// examples.run();
}
Deleted: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicHandlerManager.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicHandlerManager.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicHandlerManager.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -1,25 +0,0 @@
-package com.xpn.p2pxwiki.communication;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.xpn.p2pxwiki.client.P2PXWikiException;
-
-public class BasicHandlerManager implements HandlerManagerInterface {
- protected static BasicHandlerManager instance = null;
- protected static Log log = LogFactory.getFactory().getInstance(BasicHandlerManager.class);
-
- public boolean addHandler(Handler handler) throws P2PXWikiException{
- return false;
- }
- public boolean removeHandler(Handler handler) throws P2PXWikiException{
- return false;
- }
-
- public static BasicHandlerManager getInstance(){
- if(instance == null){
- instance = new BasicHandlerManager();
- }
- return instance;
- }
-}
Deleted: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicNetwork.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicNetwork.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicNetwork.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -1,23 +0,0 @@
-package com.xpn.p2pxwiki.communication;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class BasicNetwork implements NetworkInterface {
- protected static BasicNetwork instance = null;
- protected static Log log = LogFactory.getFactory().getInstance(BasicNetwork.class);
-
- public String getCanonicalLocalName() {
- return "localhost";
- }
- public String getCanonicalRemoteName(String peer) {
- return peer;
- }
-
- public static BasicNetwork getInstance(){
- if(instance == null){
- instance = new BasicNetwork();
- }
- return instance;
- }
-}
Deleted: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicRemoteConnectionFactory.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicRemoteConnectionFactory.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/BasicRemoteConnectionFactory.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -1,26 +0,0 @@
-package com.xpn.p2pxwiki.communication;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.xpn.p2pxwiki.client.P2PXWikiException;
-
-public class BasicRemoteConnectionFactory implements
- RemoteConnectionFactoryInterface {
- protected static BasicRemoteConnectionFactory instance = null;
- protected static Log log = LogFactory.getFactory().getInstance(BasicRemoteConnectionFactory.class);
-
- protected BasicRemoteConnectionFactory(){
- }
-
- public HandlerStub getConnection(String peer) throws P2PXWikiException{
- return null;
- }
-
- public static BasicRemoteConnectionFactory getInstance(){
- if(instance == null){
- instance = new BasicRemoteConnectionFactory();
- }
- return instance;
- }
-}
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/ConnectorPlugin.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/ConnectorPlugin.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/ConnectorPlugin.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -52,11 +52,11 @@
*/
public class ConnectorPlugin extends XWikiDefaultPlugin implements XWikiPluginInterface{
public static final String NETWORK_TYPE = "p2pxwiki.connector.network";
- public static final String DEFAULT_NETWORK_TYPE = "com.xpn.p2pxwiki.communication.rpc.jxta.JxtaNetwork";
+ public static final String DEFAULT_NETWORK_TYPE = "com.xpn.p2pxwiki.communication.jxta.JxtaNetwork";
public static final String CONNECTOR_FACTORY = "p2pxwiki.connector.type";
- public static final String DEFAULT_CONNECTOR_FACTORY = "com.xpn.p2pxwiki.communication.rpc.jxta.XmlRpcJxtaRemoteConnectionFactory";
+ public static final String DEFAULT_CONNECTOR_FACTORY = "com.xpn.p2pxwiki.communication.jxta.XmlRpcJxtaRemoteConnectionFactory";
public static final String HANDLERMANAGER = "p2pxwiki.connector.handler";
- public static final String DEFAULT_HANDLERMANAGER = "com.xpn.p2pxwiki.communication.rpc.jxta.XmlRpcJxtaHandlerManager";
+ public static final String DEFAULT_HANDLERMANAGER = "com.xpn.p2pxwiki.communication.jxta.JxtaHandlerManager";
public static final String SERVER_PORT = "p2pxwiki.server.port";
public static final int DEFAULT_SERVER_PORT = 8081;
public static final String CACHETIME = "p2pxwiki.connector.cachetime";
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/HandlerManagerInterface.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/HandlerManagerInterface.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/HandlerManagerInterface.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -3,6 +3,19 @@
import com.xpn.p2pxwiki.client.P2PXWikiException;
public interface HandlerManagerInterface {
+ /**
+ *
+ * @param handler
+ * @return true on succcess
+ * @throws P2PXWikiException
+ */
boolean addHandler(Handler handler) throws P2PXWikiException;
+
+ /**
+ *
+ * @param handler
+ * @return true on succcess
+ * @throws P2PXWikiException
+ */
boolean removeHandler(Handler handler) throws P2PXWikiException;
}
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/HandlerStub.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/HandlerStub.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/HandlerStub.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -1,13 +1,10 @@
package com.xpn.p2pxwiki.communication;
-import java.util.Vector;
import com.xpn.p2pxwiki.client.P2PXWikiException;
public interface HandlerStub {
String getPeerName();
- Object execute(String function, Vector params, Vector paramTypes) throws P2PXWikiException;
- Object execute(String function, Vector params) throws P2PXWikiException;
- boolean needsParamTypes();
+ Object execute(String function, Object[] params) throws P2PXWikiException;
void close() throws P2PXWikiException;
}
Deleted: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/Network.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/Network.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/Network.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -1,55 +0,0 @@
-package com.xpn.p2pxwiki.communication.rpc;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.xpn.p2pxwiki.communication.BasicNetwork;
-import com.xpn.p2pxwiki.communication.ConnectorPlugin;
-import com.xpn.p2pxwiki.communication.NetworkInterface;
-
-public class Network extends BasicNetwork implements NetworkInterface{
- private static Log log = LogFactory.getFactory().getInstance(Network.class);
- private static boolean inited = false;
-
- protected Network(){
- log.debug("constructor");
- init();
- }
-
- protected void init(){
- if(inited){
- return;
- }
- inited = true;
- }
-
- /**
- * @see com.xpn.p2pxwiki.communication.NetworkInterface#getCanonicalLocalName()
- * TODO: This should be written differently. How?
- */
- public String getCanonicalLocalName() {
- try{
- return "http://" + InetAddress.getLocalHost().getCanonicalHostName() + ":" + ConnectorPlugin.getServerPort();
- }
- catch(UnknownHostException ex){
- return "http://" + ConnectorPlugin.getPeerName() + ".xwiki.com:" + ConnectorPlugin.getServerPort();
- }
- }
-
- /**
- * @see com.xpn.p2pxwiki.communication.BasicNetwork#getCanonicalRemoteName(java.lang.String)
- */
- public String getCanonicalRemoteName(String peer) {
- return "http://" + peer + ":" + ConnectorPlugin.getServerPort();
- }
-
- public static BasicNetwork getInstance(){
- if(instance == null){
- instance = new Network();
- }
- return instance;
- }
-}
Copied: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcConnectionFactory.java (from rev 1174, xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcRemoteConnectionFactory.java)
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcRemoteConnectionFactory.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcConnectionFactory.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -0,0 +1,41 @@
+package com.xpn.p2pxwiki.communication.rpc;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.xpn.p2pxwiki.client.P2PXWikiException;
+import com.xpn.p2pxwiki.communication.HandlerStub;
+import com.xpn.p2pxwiki.communication.RemoteConnectionFactoryInterface;
+
+public class RpcConnectionFactory
+ implements RemoteConnectionFactoryInterface {
+ private static Log log = LogFactory.getFactory().getInstance(RpcConnectionFactory.class);
+
+ protected static RpcConnectionFactory instance = null;
+
+ protected RpcConnectionFactory(){
+ log.debug("constructor");
+ init();
+ }
+
+ protected void init(){
+ log.debug("init");
+ // Nothing to be done here
+ }
+
+ /**
+ * @see com.xpn.p2pxwiki.communication.BasicRemoteConnectionFactory#getConnection(java.lang.String)
+ */
+ public HandlerStub getConnection(String peer) throws P2PXWikiException {
+ log.debug("getConnection");
+ return new RpcHandlerStub(peer);
+ }
+
+ public static RpcConnectionFactory getInstance(){
+ log.debug("getInstance");
+ if(instance == null){
+ instance = new RpcConnectionFactory();
+ }
+ return instance;
+ }
+}
Copied: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcHandlerManager.java (from rev 1174, xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerManager.java)
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerManager.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcHandlerManager.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -0,0 +1,57 @@
+package com.xpn.p2pxwiki.communication.rpc;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.xmlrpc.WebServer;
+
+import com.xpn.p2pxwiki.client.P2PXWikiException;
+import com.xpn.p2pxwiki.communication.ConnectorPlugin;
+import com.xpn.p2pxwiki.communication.Handler;
+import com.xpn.p2pxwiki.communication.HandlerManagerInterface;
+
+public class RpcHandlerManager implements HandlerManagerInterface {
+ private static Log log = LogFactory.getFactory().getInstance(RpcHandlerManager.class);
+ private WebServer webserver;
+
+ protected static RpcHandlerManager instance = null;
+
+ protected RpcHandlerManager(){
+ log.debug("constructor");
+ init();
+ }
+
+ protected void init(){
+ log.debug("init");
+ try {
+ log.debug("Starting the XMLRPC server thread");
+ webserver = new WebServer(ConnectorPlugin.getServerPort());
+ webserver.start();
+ log.debug("XMLRPC Server thread started");
+ } catch (Exception ex) {
+ log.error("Error initializing!", ex);
+ }
+ }
+
+ /**
+ * @see com.xpn.p2pxwiki.communication.BasicHandlerManager#addHandler(com.xpn.p2pxwiki.communication.Handler)
+ */
+ public boolean addHandler(Handler handler) throws P2PXWikiException {
+ webserver.addHandler(handler.getName(), handler);
+ return true;
+ }
+
+ /**
+ * @see com.xpn.p2pxwiki.communication.BasicHandlerManager#removeHandler(com.xpn.p2pxwiki.communication.Handler)
+ */
+ public boolean removeHandler(Handler handler) throws P2PXWikiException {
+ webserver.removeHandler(handler.getName());
+ return true;
+ }
+
+ public static RpcHandlerManager getInstance(){
+ if(instance == null){
+ instance = new RpcHandlerManager();
+ }
+ return instance;
+ }
+}
Copied: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcHandlerStub.java (from rev 1174, xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerStub.java)
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerStub.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcHandlerStub.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -0,0 +1,53 @@
+package com.xpn.p2pxwiki.communication.rpc;
+
+import java.io.IOException;
+import java.util.Vector;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.xmlrpc.XmlRpcClientLite;
+import org.apache.xmlrpc.XmlRpcException;
+
+import com.xpn.p2pxwiki.client.P2PXWikiException;
+import com.xpn.p2pxwiki.communication.ConnectorPlugin;
+import com.xpn.p2pxwiki.communication.HandlerStub;
+
+public class RpcHandlerStub implements HandlerStub {
+ protected static Log log = LogFactory.getFactory().getInstance(RpcHandlerStub.class);
+ private String peer;
+ private XmlRpcClientLite connection = null;
+
+ public RpcHandlerStub(String peer){
+ try {
+ this.peer = peer;
+ this.connection = new XmlRpcClientLite(ConnectorPlugin.getNetwork().getCanonicalRemoteName(peer));
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+
+ public Object execute(String function, Object[] params) throws P2PXWikiException{
+ try{
+ Vector v = new Vector();
+ v.copyInto(params);
+ return connection.execute(function, v);
+ }
+ catch(XmlRpcException ex){
+ throw new P2PXWikiException(P2PXWikiException.ERROR_P2PXWIKI_REMOTECALL, "Cannot execute remote call because of an unhandled RPC exception", ex);
+ }
+ catch(IOException ex){
+ throw new P2PXWikiException(P2PXWikiException.ERROR_P2PXWIKI_COMMUNICATION, "Cannot execute remote call because of an unhandled IO exception", ex);
+ }
+ }
+
+ /**
+ * @see com.xpn.p2pxwiki.communication.HandlerStub#getPeerName()
+ */
+ public String getPeerName() {
+ return this.peer;
+ }
+
+ public void close(){
+ // Nothing to do here
+ }
+}
Copied: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcNetwork.java (from rev 1174, xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/Network.java)
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/Network.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/RpcNetwork.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -0,0 +1,56 @@
+package com.xpn.p2pxwiki.communication.rpc;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.xpn.p2pxwiki.communication.ConnectorPlugin;
+import com.xpn.p2pxwiki.communication.NetworkInterface;
+
+public class RpcNetwork implements NetworkInterface{
+ private static Log log = LogFactory.getFactory().getInstance(RpcNetwork.class);
+ private static boolean inited = false;
+
+ protected static RpcNetwork instance = null;
+
+ protected RpcNetwork(){
+ log.debug("constructor");
+ init();
+ }
+
+ protected void init(){
+ if(inited){
+ return;
+ }
+ inited = true;
+ }
+
+ /**
+ * @see com.xpn.p2pxwiki.communication.NetworkInterface#getCanonicalLocalName()
+ * FIXME: This should be written differently. How?
+ */
+ public String getCanonicalLocalName() {
+ try{
+ return "http://" + InetAddress.getLocalHost().getCanonicalHostName() + ":" + ConnectorPlugin.getServerPort();
+ }
+ catch(UnknownHostException ex){
+ return "http://" + ConnectorPlugin.getPeerName() + ".xwiki.com:" + ConnectorPlugin.getServerPort();
+ }
+ }
+
+ /**
+ * @see com.xpn.p2pxwiki.communication.BasicNetwork#getCanonicalRemoteName(java.lang.String)
+ */
+ public String getCanonicalRemoteName(String peer) {
+ return "http://" + peer + ":" + ConnectorPlugin.getServerPort();
+ }
+
+ public static RpcNetwork getInstance(){
+ if(instance == null){
+ instance = new RpcNetwork();
+ }
+ return instance;
+ }
+}
Deleted: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerManager.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerManager.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerManager.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -1,56 +0,0 @@
-package com.xpn.p2pxwiki.communication.rpc;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xmlrpc.WebServer;
-
-import com.xpn.p2pxwiki.client.P2PXWikiException;
-import com.xpn.p2pxwiki.communication.BasicHandlerManager;
-import com.xpn.p2pxwiki.communication.ConnectorPlugin;
-import com.xpn.p2pxwiki.communication.Handler;
-import com.xpn.p2pxwiki.communication.HandlerManagerInterface;
-
-public class XmlRpcHandlerManager extends BasicHandlerManager implements HandlerManagerInterface {
- private static Log log = LogFactory.getFactory().getInstance(XmlRpcHandlerManager.class);
- private WebServer webserver;
-
- protected XmlRpcHandlerManager(){
- log.debug("constructor");
- init();
- }
-
- protected void init(){
- log.debug("init");
- try {
- log.debug("Starting the XMLRPC server thread");
- webserver = new WebServer(ConnectorPlugin.getServerPort());
- webserver.start();
- log.debug("XMLRPC Server thread started");
- } catch (Exception ex) {
- log.error("Error initializing!", ex);
- }
- }
-
- /**
- * @see com.xpn.p2pxwiki.communication.BasicHandlerManager#addHandler(com.xpn.p2pxwiki.communication.Handler)
- */
- public boolean addHandler(Handler handler) throws P2PXWikiException {
- webserver.addHandler(handler.getName(), handler);
- return true;
- }
-
- /**
- * @see com.xpn.p2pxwiki.communication.BasicHandlerManager#removeHandler(com.xpn.p2pxwiki.communication.Handler)
- */
- public boolean removeHandler(Handler handler) throws P2PXWikiException {
- webserver.removeHandler(handler.getName());
- return true;
- }
-
- public static BasicHandlerManager getInstance(){
- if(instance == null){
- instance = new XmlRpcHandlerManager();
- }
- return instance;
- }
-}
Deleted: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerStub.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerStub.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcHandlerStub.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -1,59 +0,0 @@
-package com.xpn.p2pxwiki.communication.rpc;
-
-import java.io.IOException;
-import java.util.Vector;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xmlrpc.XmlRpcClientLite;
-import org.apache.xmlrpc.XmlRpcException;
-
-import com.xpn.p2pxwiki.client.P2PXWikiException;
-import com.xpn.p2pxwiki.communication.ConnectorPlugin;
-import com.xpn.p2pxwiki.communication.HandlerStub;
-
-public class XmlRpcHandlerStub implements HandlerStub {
- protected static Log log = LogFactory.getFactory().getInstance(XmlRpcHandlerStub.class);
- private String peer;
- private XmlRpcClientLite connection = null;
-
- public XmlRpcHandlerStub(String peer){
- try {
- this.peer = peer;
- this.connection = new XmlRpcClientLite(ConnectorPlugin.getNetwork().getCanonicalRemoteName(peer));
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- }
- }
-
- public Object execute(String function, Vector params, Vector paramTypes) throws P2PXWikiException{
- return execute(function, params);
- }
-
- public Object execute(String function, Vector params) throws P2PXWikiException{
- try{
- return connection.execute(function, params);
- }
- catch(XmlRpcException ex){
- throw new P2PXWikiException(P2PXWikiException.ERROR_P2PXWIKI_REMOTECALL, "Cannot execute remote call because of an unhandled RPC exception", ex);
- }
- catch(IOException ex){
- throw new P2PXWikiException(P2PXWikiException.ERROR_P2PXWIKI_COMMUNICATION, "Cannot execute remote call because of an unhandled IO exception", ex);
- }
- }
-
- public boolean needsParamTypes() {
- return false;
- }
-
- /**
- * @see com.xpn.p2pxwiki.communication.HandlerStub#getPeerName()
- */
- public String getPeerName() {
- return this.peer;
- }
-
- public void close(){
- // Nothing to do here
- }
-}
Deleted: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcRemoteConnectionFactory.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcRemoteConnectionFactory.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/communication/rpc/XmlRpcRemoteConnectionFactory.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -1,41 +0,0 @@
-package com.xpn.p2pxwiki.communication.rpc;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.xpn.p2pxwiki.client.P2PXWikiException;
-import com.xpn.p2pxwiki.communication.BasicRemoteConnectionFactory;
-import com.xpn.p2pxwiki.communication.HandlerStub;
-import com.xpn.p2pxwiki.communication.RemoteConnectionFactoryInterface;
-
-public class XmlRpcRemoteConnectionFactory extends
- BasicRemoteConnectionFactory implements
- RemoteConnectionFactoryInterface {
- private static Log log = LogFactory.getFactory().getInstance(XmlRpcRemoteConnectionFactory.class);
-
- protected XmlRpcRemoteConnectionFactory(){
- log.debug("constructor");
- init();
- }
-
- protected void init(){
- log.debug("init");
- // Nothing to be done here
- }
-
- /**
- * @see com.xpn.p2pxwiki.communication.BasicRemoteConnectionFactory#getConnection(java.lang.String)
- */
- public HandlerStub getConnection(String peer) throws P2PXWikiException {
- log.debug("getConnection");
- return new XmlRpcHandlerStub(peer);
- }
-
- public static BasicRemoteConnectionFactory getInstance(){
- log.debug("getInstance");
- if(instance == null){
- instance = new XmlRpcRemoteConnectionFactory();
- }
- return instance;
- }
-}
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/registry/P2PXWikiRegistryHandlerPlugin.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/registry/P2PXWikiRegistryHandlerPlugin.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/registry/P2PXWikiRegistryHandlerPlugin.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -25,8 +25,6 @@
private P2PXWikiEngineContext econtext = null;
private P2PXWikiRequest request = null;
private P2PXWikiResponse response = null;
- private XWikiContext context;
-
private static Log log = LogFactory.getFactory().getInstance(
com.xpn.p2pxwiki.registry.P2PXWikiRegistryHandlerPlugin.class);
@@ -46,7 +44,6 @@
public void init(XWikiContext context) {
super.init(context);
log.error("We are inside the init method of p2pxwikiRegistry Plugin !!!");
- this.context = context;
XmlRpc.setKeepAlive(true);
//P2PXWikiRPCCommons.initJxta(P2PXWikiRPCCommons.getJxtaXWikiRegistryHost(),context);
try {
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/replication/P2PXWikiReplicationHandler.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/replication/P2PXWikiReplicationHandler.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/replication/P2PXWikiReplicationHandler.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -287,7 +287,6 @@
log.error("trying to look at all xml documents, total size:"+ docsXML.size());
boolean res = true;
try {
- XWiki wiki = context.getWiki();
for (int i = 0; i < docsXML.size(); i++) {
log.error("looking at document #"+i+" for replication");
String xmlDoc = (String) docsXML.get(i);
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/replication/P2PXWikiReplicationHandlerPlugin.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/replication/P2PXWikiReplicationHandlerPlugin.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/replication/P2PXWikiReplicationHandlerPlugin.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -37,11 +37,8 @@
}
public void init(XWikiContext context) {
+ log.debug("initializing");
super.init(context);
- boolean newwebserver = false;
- String username = context.getWiki().Param("xwiki.p2pxwiki.username");
- //2PXWikiRPCCommons.initJxta(username,context);
-
try {
if (context.get("p2pxwikijxtaenginecontext") == null) {
XWiki wiki = context.getWiki();
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/rpc/P2PXWikiConfluenceRpcHandler.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/rpc/P2PXWikiConfluenceRpcHandler.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/rpc/P2PXWikiConfluenceRpcHandler.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -124,8 +124,6 @@
public boolean logout(String token, String wikiapp) throws XWikiException {
XWikiContext context = init(wikiapp);
- XWiki xwiki = context.getWiki();
-
// Verify authentication token
checkToken(token, context);
@@ -135,8 +133,6 @@
Hashtable getServerInfo(String token, String wikiapp) throws XWikiException {
XWikiContext context = init(wikiapp);
- XWiki xwiki = context.getWiki();
-
// Verify authentication token
checkToken(token, context);
@@ -164,8 +160,6 @@
public Hashtable getSpace(String token, String spaceKey, String wikiapp) throws XWikiException {
XWikiContext context = init(wikiapp);
- XWiki xwiki = context.getWiki();
-
// Verify authentication token
checkToken(token, context);
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/rpc/P2PXWikiRPCHandlerPlugin.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/rpc/P2PXWikiRPCHandlerPlugin.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/rpc/P2PXWikiRPCHandlerPlugin.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -48,7 +48,6 @@
log.debug("Username: " + username);
//P2PXWikiRPCCommons.initJxta(username,context);
log.debug("Done initJxta");
- boolean newwebserver = false;
try {
if (context.get("p2pxwikijxtaenginecontext") == null) {
XWiki wiki = context.getWiki();
Modified: xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/utils/P2PXWikiEngineContext.java
===================================================================
--- xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/utils/P2PXWikiEngineContext.java 2006-08-19 17:25:17 UTC (rev 1174)
+++ xwiki-clients/p2pxwiki/src/main/java/com/xpn/p2pxwiki/utils/P2PXWikiEngineContext.java 2006-08-19 19:07:09 UTC (rev 1175)
@@ -10,7 +10,6 @@
import org.apache.commons.logging.LogFactory;
import com.xpn.xwiki.web.XWikiEngineContext;
-import com.xpn.xwiki.xmlrpc.XWikiXMLRPCContext;
public class P2PXWikiEngineContext implements XWikiEngineContext {
private static Log log = LogFactory.getFactory().getInstance(
More information about the Xwiki-notifications
mailing list