Author: szimano Date: 2005-10-17 06:43:02 -0400 (Mon, 17 Oct 2005) New Revision: 1399 Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AddTranslatorPartsPlugin.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/InsertPageInsidePlugin.java Removed: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/JBossPortalCredentials.java Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/WikiInsidePlugins.xml Log: InsertPage plugin http://jira.jboss.com/jira/browse/JBWIKI-57 Deleted: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/JBossPortalCredentials.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/JBossPortalCredentials.java 2005-10-17 10:01:19 UTC (rev 1398) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/JBossPortalCredentials.java 2005-10-17 10:43:02 UTC (rev 1399) @@ -1,62 +0,0 @@ -package org.jboss.wiki; - -import javax.portlet.ActionRequest; -import javax.portlet.RenderRequest; - -import org.jboss.portlet.JBossActionRequest; -import org.jboss.portlet.JBossRenderRequest; - -public class JBossPortalCredentials extends Credentials { - - private String admin_user_name = "admin"; - - private String name = null; - private boolean logedIn = false; - private boolean isAdmin = false; - - public JBossPortalCredentials(RenderRequest rReq) { - if (rReq instanceof JBossRenderRequest) { - JBossRenderRequest jrReq = (JBossRenderRequest)rReq; - - if (jrReq.getUser() != null) { - name = jrReq.getUser().getUserName(); - logedIn = true; - isAdmin = (name.equals(admin_user_name)); - } - else { - name = "Unknown"; - } - - } - else { - System.err.println("You are not running JBoss Portal"); - } - } - - public JBossPortalCredentials(ActionRequest rReq) { - if (rReq instanceof JBossActionRequest) { - JBossActionRequest jrReq = (JBossActionRequest)rReq; - - if (jrReq.getUser() != null) { - name = jrReq.getUser().getUserName(); - logedIn = true; - isAdmin = (name.equals(admin_user_name)); - } - - } - else { - System.err.println("You are not running JBoss Portal"); - } - } - - public String getName() { - return name; - } - public boolean isAdmin() { - return isAdmin; - } - public boolean isLogedIn() { - return logedIn; - } - -} Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml 2005-10-17 10:01:19 UTC (rev 1398) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml 2005-10-17 10:43:02 UTC (rev 1399) @@ -21,17 +21,33 @@ <class>org.jboss.wiki.plugins.AttachmentListPlugin</class> </plugin> <plugin> + <name>adminConsole</name> + <class>org.jboss.wiki.plugins.AdminConsolePlugin</class> + </plugin> + <plugin> + <name>wikiToHtmlTranslator</name> + <class>org.jboss.wiki.plugins.HTMLTranslatorParts</class> + </plugin> + <plugin> <name>friendlyLinks</name> <class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class> </plugin> + </wikiType> + <wikiType> + <name>htmlClear</name> + <class>org.jboss.wiki.plugins.DefaultWikiType</class> <plugin> - <name>adminConsole</name> - <class>org.jboss.wiki.plugins.AdminConsolePlugin</class> + <name>addTranslatorPart</name> + <class>org.jboss.wiki.plugins.AddTranslatorPartsPlugin</class> </plugin> <plugin> <name>wikiToHtmlTranslator</name> <class>org.jboss.wiki.plugins.HTMLTranslatorParts</class> </plugin> + <plugin> + <name>friendlyLinks</name> + <class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class> + </plugin> </wikiType> <wikiType> <name>diff</name> Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/WikiInsidePlugins.xml =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/WikiInsidePlugins.xml 2005-10-17 10:01:19 UTC (rev 1398) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/WikiInsidePlugins.xml 2005-10-17 10:43:02 UTC (rev 1399) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <properties> -<comment>tak do zajebania</comment> +<comment>Here are defined inside plugins</comment> <entry key="tomek">org.jboss.wiki.plugins.TomekInsidePlugin</entry> +<entry key="InsertPage">org.jboss.wiki.plugins.InsertPageInsidePlugin</entry> </properties> \ No newline at end of file Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java 2005-10-17 10:01:19 UTC (rev 1398) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/JBossPortalCredentials.java 2005-10-17 10:43:02 UTC (rev 1399) @@ -0,0 +1,67 @@ +package org.jboss.wiki; + + +import javax.portlet.ActionRequest; +import javax.portlet.RenderRequest; + +import org.jboss.portlet.JBossActionRequest; +import org.jboss.portlet.JBossRenderRequest; + +public class JBossPortalCredentials extends Credentials { + + private String admin_user_name = "admin"; + + private String name = null; + private boolean logedIn = false; + private boolean isAdmin = false; + + public JBossPortalCredentials() { + + } + + public void setRenderRequest(RenderRequest rReq) { + if (rReq instanceof JBossRenderRequest) { + JBossRenderRequest jrReq = (JBossRenderRequest)rReq; + + if (jrReq.getUser() != null) { + name = jrReq.getUser().getUserName(); + logedIn = true; + isAdmin = (name.equals(admin_user_name)); + } + else { + name = "Unknown"; + } + + } + else { + System.err.println("You are not running JBoss Portal"); + } + } + + public void setActionRequest(ActionRequest rReq) { + if (rReq instanceof JBossActionRequest) { + JBossActionRequest jrReq = (JBossActionRequest)rReq; + + if (jrReq.getUser() != null) { + name = jrReq.getUser().getUserName(); + logedIn = true; + isAdmin = (name.equals(admin_user_name)); + } + + } + else { + System.err.println("You are not running JBoss Portal"); + } + } + + public String getName() { + return name; + } + public boolean isAdmin() { + return isAdmin; + } + public boolean isLogedIn() { + return logedIn; + } + +} Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AddTranslatorPartsPlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AddTranslatorPartsPlugin.java 2005-10-17 10:01:19 UTC (rev 1398) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AddTranslatorPartsPlugin.java 2005-10-17 10:43:02 UTC (rev 1399) @@ -0,0 +1,21 @@ +package org.jboss.wiki.plugins; + +import org.jboss.wiki.WikiPage; +import org.jboss.wiki.WikiPlugin; +import org.jboss.wiki.WikiSession; + +public class AddTranslatorPartsPlugin extends WikiPlugin { + + @Override + public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) { + wikiPage.setPageContent(HTMLTranslatorParts.pagePartRegexStart+wikiPage.getContent()+HTMLTranslatorParts.pagePartRegexEnd); + + return wikiPage; + } + + @Override + public void init() { + + } + +} Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/InsertPageInsidePlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/InsertPageInsidePlugin.java 2005-10-17 10:01:19 UTC (rev 1398) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/InsertPageInsidePlugin.java 2005-10-17 10:43:02 UTC (rev 1399) @@ -0,0 +1,39 @@ +package org.jboss.wiki.plugins; + +import java.util.HashMap; + +import org.jboss.wiki.WikiContext; +import org.jboss.wiki.WikiInsidePlugin; +import org.jboss.wiki.WikiPage; +import org.jboss.wiki.WikiSession; + +public class InsertPageInsidePlugin extends WikiInsidePlugin { + + @Override + public String process(WikiPage wikiPage, WikiSession wikiSession, + HashMap<String, String> attributes) { + String ret = wikiPage.getContent(); + + String page = attributes.get("page"); + + if (page == null) { + ret = "<i>There is no 'page' attribute which is mandatory for InsertPage plugin</i>"; + } + else { + WikiContext wikiContext = new WikiContext(null, wikiEngine.getWikiType("htmlClear"), wikiSession); + + WikiPage about = wikiEngine.getByName(page, wikiContext); + + ret = HTMLTranslatorParts.pagePartRegexStart+about.getContent()+HTMLTranslatorParts.pagePartRegexEnd; + } + + return ret; + } + + @Override + public void init() { + // TODO Auto-generated method stub + + } + +} |