Author: metskem
Date: Mon Nov 10 10:02:54 2008
New Revision: 712710
URL: http://svn.apache.org/viewvc?rev=712710&view=rev
Log:
3.0.0-svn-4 JSPWIKI-276: jsonrpc replaced by jabsorb. Note that web.xml had
changes
Added:
incubator/jspwiki/trunk/lib/jabsorb-1.3.jar (with props)
incubator/jspwiki/trunk/lib/slf4j-api-1.5.5.jar (with props)
incubator/jspwiki/trunk/lib/slf4j-log4j12-1.5.5.jar (with props)
Removed:
incubator/jspwiki/trunk/lib/jsonrpc-1.0.jar
Modified:
incubator/jspwiki/trunk/.classpath
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/LICENSE
incubator/jspwiki/trunk/etc/web.xml
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java
Modified: incubator/jspwiki/trunk/.classpath
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=712710&r1=712709&r2=712710&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Mon Nov 10 10:02:54 2008
@@ -8,12 +8,12 @@
<classpathentry kind="lib" path="lib/jdom.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
<classpathentry kind="lib" path="lib/akismet-java-1.02.jar"/>
- <classpathentry kind="lib" path="lib/jsonrpc-1.0.jar"
sourcepath="/Users/jalkanen/Java/json-rpc-java-1.0/src"/>
- <classpathentry kind="lib" path="lib/xmlrpc.jar"
sourcepath="/Users/jalkanen/Java/xmlrpc-2.0.1/xmlrpc-2.0.1-sources.jar"/>
+ <classpathentry kind="lib" path="lib/jabsorb-1.3.jar"/>
+ <classpathentry kind="lib" path="lib/xmlrpc.jar"/>
<classpathentry kind="lib" path="lib/jrcs-diff.jar"/>
<classpathentry kind="lib" path="tests/lib/xercesImpl-2.6.2.jar"/>
<classpathentry kind="lib" path="lib/sandler.jar"/>
- <classpathentry kind="lib" path="lib/oscache.jar"
sourcepath="/Users/jalkanen/Java/oscache-2.2/src/java"/>
+ <classpathentry kind="lib" path="lib/oscache.jar"/>
<classpathentry kind="lib" path="lib/oro.jar"/>
<classpathentry kind="lib" path="lib/nekohtml.jar"/>
<classpathentry kind="lib" path="lib/lucene.jar"/>
@@ -40,6 +40,6 @@
<classpathentry kind="lib" path="tests/lib/jetty-servlet-5.1.14.jar"/>
<classpathentry kind="lib" path="tests/lib/stripes-1.5.jar"/>
<classpathentry kind="lib"
path="tests/lib/selenium-server-1.0-beta1.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM
1.5.0"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=712710&r1=712709&r2=712710&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Nov 10 10:02:54 2008
@@ -1,3 +1,12 @@
+2008-11-10 Harry Metske <[EMAIL PROTECTED]>
+
+ * 3.0.0-svn-4
+
+ * JSPWIKI-276: jsonrpc replaced by jabsorb, reported by Jorge Ferrer.
+
+ Note that web.xml had changes, the package name
com.metaparadigm.jsonrpc has been
+ changed to org.jabsorb.
+
2008-11-09 Harry Metske <[EMAIL PROTECTED]>
* 3.0.0-svn-3
Modified: incubator/jspwiki/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/LICENSE?rev=712710&r1=712709&r2=712710&view=diff
==============================================================================
--- incubator/jspwiki/trunk/LICENSE (original)
+++ incubator/jspwiki/trunk/LICENSE Mon Nov 10 10:02:54 2008
@@ -222,7 +222,7 @@
jaxen.jar
doc/LICENSE.jaxen
jdom.jar
doc/LICENSE.jdom
jrcs-diff.jar LICENSE
-jsonrpc-1.0.jar
LICENSE
+jabsorb-1.3.jar
LICENSE
jsp-api.jar
LICENSE
log4j-1.2.14.jar LICENSE
lucene-highlighter.jar LICENSE
@@ -234,6 +234,8 @@
sandler.jar
doc/LICENSE.sandler
servlet-api.jar
doc/LICENSE.cddl
xmlrpc.jar
LICENSE
+slf4j-api-1.5.5.jar MIT-style license
+slf4j-log4j12-1.5.5.jar MIT-style license
TEST LIBRARY LICENSE
FILE
===================================================================================
Modified: incubator/jspwiki/trunk/etc/web.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/web.xml?rev=712710&r1=712709&r2=712710&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/web.xml (original)
+++ incubator/jspwiki/trunk/etc/web.xml Mon Nov 10 10:02:54 2008
@@ -126,8 +126,8 @@
<!-- JSON AJAX API -->
<servlet>
- <servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
- <servlet-class>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-class>
+ <servlet-name>org.jabsorb.JSONRPCServlet</servlet-name>
+ <servlet-class>org.jabsorb.JSONRPCServlet</servlet-class>
</servlet>
<!-- Atom Publishing Protocol -->
@@ -204,7 +204,7 @@
-->
<servlet-mapping>
- <servlet-name>com.metaparadigm.jsonrpc.JSONRPCServlet</servlet-name>
+ <servlet-name>org.jabsorb.JSONRPCServlet</servlet-name>
<url-pattern>/JSON-RPC</url-pattern>
</servlet-mapping>
Added: incubator/jspwiki/trunk/lib/jabsorb-1.3.jar
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/lib/jabsorb-1.3.jar?rev=712710&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/lib/jabsorb-1.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/lib/slf4j-api-1.5.5.jar
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/lib/slf4j-api-1.5.5.jar?rev=712710&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/lib/slf4j-api-1.5.5.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/lib/slf4j-log4j12-1.5.5.jar
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/lib/slf4j-log4j12-1.5.5.jar?rev=712710&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/lib/slf4j-log4j12-1.5.5.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=712710&r1=712709&r2=712710&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Mon Nov 10
10:02:54 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "3";
+ public static final String BUILD = "4";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java?rev=712710&r1=712709&r2=712710&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java
Mon Nov 10 10:02:54 2008
@@ -21,7 +21,6 @@
package com.ecyrd.jspwiki.preferences;
import java.text.DateFormat;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -31,6 +30,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import org.json.JSONException;
import org.json.JSONObject;
import com.ecyrd.jspwiki.InternalWikiException;
@@ -152,7 +152,7 @@
prefs.put(key, jo.getString(key) );
}
}
- catch( ParseException e )
+ catch( JSONException e )
{
}
}
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java?rev=712710&r1=712709&r2=712710&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java
Mon Nov 10 10:02:54 2008
@@ -20,6 +20,7 @@
*/
package com.ecyrd.jspwiki.rpc.json;
+import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Method;
import java.security.Permission;
import java.util.HashMap;
@@ -38,8 +39,8 @@
import com.ecyrd.jspwiki.rpc.RPCCallable;
import com.ecyrd.jspwiki.rpc.RPCManager;
import com.ecyrd.jspwiki.ui.TemplateManager;
-import com.metaparadigm.jsonrpc.InvocationCallback;
-import com.metaparadigm.jsonrpc.JSONRPCBridge;
+import org.jabsorb.callback.InvocationCallback;
+import org.jabsorb.JSONRPCBridge;
/**
* Provides an easy-to-use interface for different modules to AJAX-enable
@@ -120,7 +121,7 @@
}
if( bridge == null) bridge = JSONRPCBridge.getGlobalBridge();
- bridge.setDebug(false);
+// bridge. setDebug(false);
return bridge;
}
@@ -182,8 +183,6 @@
/**
* Does not do anything.
- *
- * [EMAIL PROTECTED]
*/
public void postInvoke(Object context, Object instance, Method method,
Object result) throws Exception
{
@@ -191,8 +190,6 @@
/**
* Checks access against the permission given.
- *
- * [EMAIL PROTECTED]
*/
public void preInvoke(Object context, Object instance, Method method,
Object[] arguments) throws Exception
{
@@ -225,6 +222,14 @@
log.debug("Failed JSON permission check: "+instance);
throw new WikiSecurityException("No permission to access this AJAX
method!");
}
+
+ public void postInvoke( Object arg0, Object arg1, AccessibleObject
arg2, Object arg3 ) throws Exception
+ {
+ }
+
+ public void preInvoke( Object arg0, Object arg1, AccessibleObject
arg2, Object[] arg3 ) throws Exception
+ {
+ }
}
