[jboss-svn-commits] JBL Code SVN: r7794 - in labs/jbosslabs/trunk/portal-extensions: forge-login-portlet/src/web/WEB-INF forge-mapper/src/java/org/jboss/labs/mapper jbosswiki/forge-wiki/src/java/org/jboss/wiki jbosswiki/forge-wiki/src/web/WEB-INF jbosswiki/wiki-common/src/etc/org/jboss/wiki
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 23 09:03:00 EST 2006
Author: szimano
Date: 2006-11-23 09:02:50 -0500 (Thu, 23 Nov 2006)
New Revision: 7794
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jboss-portlet.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/wikiPlugins.properties
Log:
wiki working under new portal
Modified: labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet-instances.xml 2006-11-23 10:54:39 UTC (rev 7793)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet-instances.xml 2006-11-23 14:02:50 UTC (rev 7794)
@@ -4,7 +4,7 @@
<if-exists>overwrite</if-exists>
<instance>
<instance-id>LoginInstance</instance-id>
- <portlet-ref>Login</portlet-ref>
+ <portlet-ref>LoginPortlet</portlet-ref>
</instance>
</deployment>
</deployments>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet.xml 2006-11-23 10:54:39 UTC (rev 7793)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/web/WEB-INF/portlet.xml 2006-11-23 14:02:50 UTC (rev 7794)
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0">
<portlet>
- <portlet-name>Login</portlet-name>
+ <portlet-name>LoginPortlet</portlet-name>
<portlet-class>org.jbosslabs.security.portlet.Login</portlet-class>
<supported-locale>en</supported-locale>
<supports>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java 2006-11-23 10:54:39 UTC (rev 7793)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandFactory.java 2006-11-23 14:02:50 UTC (rev 7794)
@@ -80,17 +80,15 @@
return null;
}
- if ("wiki".equals(name)) {
- /* TODO remove
- System.out.println("WIKI PAGE! " + getParameter(invocation, "page"));*/
-
+ /*if ("wiki".equals(name)) {
+
Parameters params = new Parameters();
setParamIfNotNull(params, "page", getParameter(invocation, "page"));
setParamIfNotNull(params, "language", getParameter(invocation, "language"));
return new InvokeWindowActionCommand("default.wiki.WikiPortletWindow", null,
null, null, null, params);
- }
+ }*/
return new RenderPageCommand(p.getId());
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2006-11-23 10:54:39 UTC (rev 7793)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2006-11-23 14:02:50 UTC (rev 7794)
@@ -354,6 +354,8 @@
String wikiURL = rRes.createActionURL().toString() + "&language="
+ langCode;
+
+ log.info(wikiURL);
rReq.setAttribute("actionURL", wikiURL);
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jboss-portlet.xml 2006-11-23 10:54:39 UTC (rev 7793)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jboss-portlet.xml 2006-11-23 14:02:50 UTC (rev 7794)
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<portlet-app>
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0">
<portlet>
<portlet-name>WikiPortlet</portlet-name>
- <portlet-class>org.jboss.wiki.WikiPortlet</portlet-class>
+ <portlet-class>org.jboss.wiki.WikiPortlet</portlet-class>
<supported-locale>en</supported-locale>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
- <portlet-mode>EDIT</portlet-mode>
</supports>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
<portlet-info>
<title>Wiki Portlet</title>
</portlet-info>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet-instances.xml 2006-11-23 10:54:39 UTC (rev 7793)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet-instances.xml 2006-11-23 14:02:50 UTC (rev 7794)
@@ -4,7 +4,7 @@
<if-exists>overwrite</if-exists>
<instance>
<instance-id>WikiPortletInstance</instance-id>
- <portlet-ref>WikiPortlet</portlet-ref>
+ <portlet-ref>wikiportlet.WikiPortlet</portlet-ref>
</instance>
</deployment>
</deployments>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml 2006-11-23 10:54:39 UTC (rev 7793)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet.xml 2006-11-23 14:02:50 UTC (rev 7794)
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0">
- <portlet>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0">
+ <portlet>
<portlet-name>WikiPortlet</portlet-name>
- <portlet-class>org.jboss.wiki.WikiPortlet</portlet-class>
+ <portlet-class>org.jboss.wiki.WikiPortlet</portlet-class>
<supported-locale>en</supported-locale>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
- <portlet-mode>EDIT</portlet-mode>
</supports>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
<portlet-info>
<title>Wiki Portlet</title>
</portlet-info>
- <window-state>
- <description>default window state</description>
- <window-state>normal</window-state>
- </window-state>
</portlet>
</portlet-app>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/wikiPlugins.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/wikiPlugins.properties 2006-11-23 10:54:39 UTC (rev 7793)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/wikiPlugins.properties 2006-11-23 14:02:50 UTC (rev 7794)
@@ -5,7 +5,8 @@
#wikiHome part of url. Leave it you use default portlet conifguration
#wikiHome = /portal/index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action
-wikiHome = /portal/index.html?ctrl:cmd=action&ctrl:window=default.wiki.WikiPortletWindow
+#wikiHome = /portal/index.html?ctrl:cmd=action&ctrl:window=default.wiki.WikiPortletWindow
+wikiHome = /portal/portal/default/wiki/WikiPortletWindow?action=1
#number of days that should be included in recent changes plugin
recentDays = 30
notification.fromEmail = do-not-reply at labs.jboss.org
More information about the jboss-svn-commits
mailing list