[jspwiki] 01/04: Build with the libjabsorb-java package instead of lib/jsonrpc-1.0.jar

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jspwiki.

commit 07805e62a43c785e4736ae6a02b3df8d926a28c5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 27 12:22:17 2015 +0100

    Build with the libjabsorb-java package instead of lib/jsonrpc-1.0.jar
---
 debian/changelog                     |  4 +--
 debian/control                       |  1 +
 debian/patches/01_jabsorb_api.dpatch | 59 +++++++++++++++++++++++++++++++-----
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9861568..4f2bf73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,8 @@ jspwiki (2.8.0-6) UNRELEASED; urgency=medium
   * Build with the default JDK instead of GCJ and removed the dependency
     on libgnujaf-java
   * Fixed the broken links to jstl.jar and standard.jar
-  * Use the Debian packages providing ecs, commons-logging and nekohtml instead
-    of the prebuilt jars in the source package
+  * Use the Debian packages providing ecs, commons-logging, jabsorb and nekohtml
+    instead of the prebuilt jars in the source package
   * Don't mark the symlink /etc/tomcat8/policy.d/05jspwiki.policy as a conffile
   * Compress the JavaScript files with the YUI compressor packaged in Debian
   * Switch to the source format 3.0 (quilt)
diff --git a/debian/control b/debian/control
index 7a63214..24f39ad 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends-Indep: libcommons-codec-java,
                      libcommons-httpclient-java,
                      libcommons-io-java,
                      libcommons-lang-java,
+                     libjabsorb-java,
                      libjakarta-ecs-java,
                      libjakarta-taglibs-standard-java,
                      libjaxen-java,
diff --git a/debian/patches/01_jabsorb_api.dpatch b/debian/patches/01_jabsorb_api.dpatch
index 060db4e..3520e4d 100644
--- a/debian/patches/01_jabsorb_api.dpatch
+++ b/debian/patches/01_jabsorb_api.dpatch
@@ -5,9 +5,8 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad jspwiki-2.8.0~/etc/web.xml jspwiki-2.8.0/etc/web.xml
---- jspwiki-2.8.0~/etc/web.xml	2008-08-03 14:07:18.000000000 +0300
-+++ jspwiki-2.8.0/etc/web.xml	2008-10-24 17:52:34.000000000 +0300
+--- a/etc/web.xml
++++ b/etc/web.xml
 @@ -126,8 +126,8 @@
  
     <!-- JSON AJAX API -->
@@ -28,17 +27,61 @@ diff -urNad jspwiki-2.8.0~/etc/web.xml jspwiki-2.8.0/etc/web.xml
         <url-pattern>/JSON-RPC</url-pattern>
     </servlet-mapping>
  
-diff -urNad jspwiki-2.8.0~/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java jspwiki-2.8.0/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java
---- jspwiki-2.8.0~/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java	2008-05-30 21:40:40.000000000 +0300
-+++ jspwiki-2.8.0/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java	2008-10-24 17:51:29.000000000 +0300
-@@ -38,8 +38,8 @@
+--- a/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java
++++ b/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java
+@@ -21,6 +21,7 @@
+ package com.ecyrd.jspwiki.rpc.json;
+ 
+ import java.lang.reflect.Method;
++import java.lang.reflect.AccessibleObject;
+ import java.security.Permission;
+ import java.util.HashMap;
+ import java.util.Iterator;
+@@ -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.InvocationCallback;
++import org.jabsorb.callback.InvocationCallback;
 +import org.jabsorb.JSONRPCBridge;
  
  /**
   *  Provides an easy-to-use interface for different modules to AJAX-enable
+@@ -120,7 +121,6 @@
+         }
+         
+         if( bridge == null) bridge = JSONRPCBridge.getGlobalBridge();
+-        bridge.setDebug(false);
+         
+         return bridge;
+     }
+@@ -185,7 +185,7 @@
+          * 
+          *  {@inheritDoc}
+          */
+-        public void postInvoke(Object context, Object instance, Method method, Object result) throws Exception
++        public void postInvoke(Object context, Object instance, AccessibleObject accessibleObject, Object result) throws Exception
+         {
+         }
+ 
+@@ -194,7 +194,7 @@
+          *  
+          *  {@inheritDoc}
+          */
+-        public void preInvoke(Object context, Object instance, Method method, Object[] arguments) throws Exception
++        public void preInvoke(Object context, Object instance, AccessibleObject accessibleObject, Object[] arguments) throws Exception
+         {
+             if( context instanceof HttpServletRequest )
+             {
+--- a/src/com/ecyrd/jspwiki/preferences/Preferences.java
++++ b/src/com/ecyrd/jspwiki/preferences/Preferences.java
+@@ -152,7 +152,7 @@
+                     prefs.put(key, jo.getString(key) );
+                 }
+             }
+-            catch( ParseException e )
++            catch( org.json.JSONException e )
+             {
+             }
+         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jspwiki.git