[jboss-svn-commits] JBL Code SVN: r19881 - in labs/jbosslabs/trunk/portal-extensions: jbosswiki/wiki-common/src/etc and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 7 08:16:31 EDT 2008
Author: szimano
Date: 2008-05-07 08:16:31 -0400 (Wed, 07 May 2008)
New Revision: 19881
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiInsidePlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorNoPlugins.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
Log:
inside plugins fixed + removed debug data from output
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java 2008-05-07 08:55:25 UTC (rev 19880)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java 2008-05-07 12:16:31 UTC (rev 19881)
@@ -32,7 +32,7 @@
session.setNote(AutologinFilter.ENTER_URI, request.getSession()
.getAttribute(AutologinFilter.ENTER_URI));
log
- .info("saved uri: "
+ .debug("saved uri: "
+ session.getNote(AutologinFilter.ENTER_URI));
}
@@ -75,12 +75,9 @@
@Override
protected String savedRequestURL(Session session) {
if (session.getNote(AutologinFilter.ENTER_URI) != null) {
- log.info("setting to: "
- + session.getNote(AutologinFilter.ENTER_URI));
return (String) session.getNote(AutologinFilter.ENTER_URI);
} else {
- log.info("enter uri is null: "
- + session.getNote(AutologinFilter.ENTER_URI));
+
return super.savedRequestURL(session);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml 2008-05-07 08:55:25 UTC (rev 19880)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml 2008-05-07 12:16:31 UTC (rev 19881)
@@ -13,10 +13,6 @@
<class>org.jboss.wiki.plugins.TrailPlugin</class>
</plugin>
<plugin>
- <name>wikiToHtmlTranslator</name>
- <class>org.jboss.wiki.plugins.HTMLTranslatorParts</class>
- </plugin>
- <plugin>
<name>wikiToHtmlTranslatorNoPlugins</name>
<class>org.jboss.wiki.plugins.HTMLTranslatorNoPlugins</class>
</plugin>
@@ -50,6 +46,10 @@
<class>org.jboss.wiki.plugins.AttachmentListPlugin</class>
</plugin>
<plugin>
+ <name>wikiToHtmlTranslator</name>
+ <class>org.jboss.wiki.plugins.HTMLTranslatorParts</class>
+ </plugin>
+ <plugin>
<name>wikiToHtmlTranslatorNoPlugins</name>
<class>org.jboss.wiki.plugins.HTMLTranslatorNoPlugins</class>
</plugin>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java 2008-05-07 08:55:25 UTC (rev 19880)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java 2008-05-07 12:16:31 UTC (rev 19881)
@@ -18,6 +18,7 @@
@Override
public String process(WikiPage wikiPage, WikiSession wikiSession,
HashMap<String, String> attributes) {
+ log.info("plugin executed");
StringBuilder recentChanges = new StringBuilder();
Integer numOfDays = Integer.MAX_VALUE;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiInsidePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiInsidePlugin.java 2008-05-07 08:55:25 UTC (rev 19880)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiInsidePlugin.java 2008-05-07 12:16:31 UTC (rev 19881)
@@ -25,6 +25,8 @@
import java.util.HashMap;
import java.util.Properties;
+import org.apache.log4j.Logger;
+
/**
*
* @author <a href="mailto:dsicore at jboss.org">Damon Sicore</a><br />
@@ -54,6 +56,8 @@
private String name;
final static String propFileName = "wikiPlugins.properties";
+
+ protected Logger log = Logger.getLogger(this.getClass());
/**
* Processes the given page, and attributes and return String to show in the apropriate place on the page.
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorNoPlugins.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorNoPlugins.java 2008-05-07 08:55:25 UTC (rev 19880)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorNoPlugins.java 2008-05-07 12:16:31 UTC (rev 19881)
@@ -1,5 +1,7 @@
package org.jboss.wiki.plugins;
public class HTMLTranslatorNoPlugins extends HTMLTranslatorParts {
- private boolean executePlugins = true;
+ protected boolean executePlugins() {
+ return false;
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java 2008-05-07 08:55:25 UTC (rev 19880)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java 2008-05-07 12:16:31 UTC (rev 19881)
@@ -128,8 +128,6 @@
// stores the name of the wiki page we are currently processing
private String pageName = "";
- private boolean executePlugins = true;
-
public HTMLTranslatorParts() {
}
@@ -826,10 +824,10 @@
if (isPluginLink(link)) {
// return null; // we do not include plugin links for now
- if (executePlugins) {
+ if (executePlugins()) {
return wikiEngine.executeInsidePlugin(link, wPage, wikiSession);
} else {
- return link;
+ return pagePartRegexStart + "[" + link + "]" + pagePartRegexEnd;
}
}
int border = link.indexOf('|');
@@ -1105,5 +1103,9 @@
mediaPatterns = getProperty("imagePatterns");
}
+
+ protected boolean executePlugins() {
+ return true;
+ }
}
More information about the jboss-svn-commits
mailing list