[pkg-java] r17845 - in trunk/jspwiki: . debian/patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-03-06 15:56:00 +0000 (Thu, 06 Mar 2014)
New Revision: 17845

Added:
   trunk/jspwiki/debian/patches/03_weblog-plugin_tweaks.patch
   trunk/jspwiki/debian/patches/series
Removed:
   trunk/jspwiki/etc/
   trunk/jspwiki/src/
Log:
Keep only the debian directory in Subversion and move the local modifications into a patch



Added: trunk/jspwiki/debian/patches/03_weblog-plugin_tweaks.patch
===================================================================
--- trunk/jspwiki/debian/patches/03_weblog-plugin_tweaks.patch	                        (rev 0)
+++ trunk/jspwiki/debian/patches/03_weblog-plugin_tweaks.patch	2014-03-06 15:56:00 UTC (rev 17845)
@@ -0,0 +1,37 @@
+--- a/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
++++ b/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
+@@ -273,7 +273,16 @@
+             for( Iterator i = blogEntries.iterator(); i.hasNext() && maxEntries-- > 0 ; )
+             {
+                 WikiPage p = (WikiPage) i.next();
+-
++                String commentPageName = TextUtil.replaceString( p.getName(),
++                                                                 "blogentry",
++                                                                 "comments" );
++                if( guessNumberOfComments( engine, commentPageName ) > 0 ) {
++                    hasComments = true;
++                }
++                else
++                {
++                    hasComments = false;
++                }
+                 if( mgr.checkPermission( context.getWikiSession(), 
+                                          new PagePermission(p, PagePermission.VIEW_ACTION) ) )
+                 {
+@@ -329,7 +338,7 @@
+         String html = engine.getHTML( entryCtx, engine.getPage(entry.getName()) );
+ 
+         // Extract the first h1/h2/h3 as title, and replace with null
+-        buffer.append("<div class=\"weblogentrytitle\">\n");
++        buffer.append("<div class=\"weblogentrytitle\">\n<a href=\""+entryCtx.getURL(WikiContext.VIEW, entry.getName())+"\">");
+         Matcher matcher = HEADINGPATTERN.matcher( html );
+         if ( matcher.find() )
+         {
+@@ -341,6 +350,7 @@
+         {
+             buffer.append( entry.getName() );
+         }
++        buffer.append("</a>\n");
+         buffer.append("</div>\n");
+ 
+         buffer.append("<div class=\"weblogentrybody\">\n");

Added: trunk/jspwiki/debian/patches/series
===================================================================
--- trunk/jspwiki/debian/patches/series	                        (rev 0)
+++ trunk/jspwiki/debian/patches/series	2014-03-06 15:56:00 UTC (rev 17845)
@@ -0,0 +1,3 @@
+01_jabsorb_api.dpatch
+02_ignore_binary_jars.dpatch
+03_weblog-plugin_tweaks.patch