[jboss-svn-commits] JBL Code SVN: r9824 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki/src/java/org/jboss/wiki/attributesextractor and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 27 18:27:39 EST 2007
Author: szimano
Date: 2007-02-27 18:27:39 -0500 (Tue, 27 Feb 2007)
New Revision: 9824
Added:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/exception/
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/exception/WikiUserPreferenceException.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_preferences.xhtml
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet-instances.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
Log:
wiki page portlet preferences
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java 2007-02-27 22:18:49 UTC (rev 9823)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java 2007-02-27 23:27:39 UTC (rev 9824)
@@ -24,6 +24,7 @@
import org.jboss.wiki.Credentials;
import org.jboss.wiki.WikiSession;
+import org.jboss.wiki.exception.WikiUserPreferenceException;
/**
* AttributesExtractor.java
@@ -53,4 +54,12 @@
public Integer getPageVersion();
public String getType();
+
+ public String getUserDefaultPage();
+
+ public String getUserDefaultLang();
+
+ public void setUserDefaultPage(String page, Object request) throws WikiUserPreferenceException;
+
+ public void setUserDefaultLang(String lang, Object request) throws WikiUserPreferenceException;
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java 2007-02-27 22:18:49 UTC (rev 9823)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java 2007-02-27 23:27:39 UTC (rev 9824)
@@ -28,6 +28,7 @@
import javax.faces.context.FacesContext;
import javax.portlet.PortletRequest;
import javax.portlet.PortletURL;
+import javax.portlet.ReadOnlyException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -36,6 +37,7 @@
import org.jboss.wiki.Credentials;
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.configuration.ConfigurationParser;
+import org.jboss.wiki.exception.WikiUserPreferenceException;
import org.jboss.wiki.helper.WikiHelper;
import org.jboss.wiki.portlet.PortletWikiSession;
@@ -50,8 +52,12 @@
private final static Logger log = Logger
.getLogger(PortletAttributesExctractor.class);
+ private static final String USER_LANG = "JBWiki:Default:Language";
+
+ private static final String USER_PAGE = "JBWiki:Default:Page";
+
private String appContext;
-
+
private String hostURL;
private WikiSession wikiSession;
@@ -65,9 +71,13 @@
private String language;
private Integer pageVersion;
-
+
private String type;
+ private String userDefaultLang;
+
+ private String userDefaultPage;
+
public PortletAttributesExctractor(Object request) {
if (request instanceof PortletRequest) {
PortletRequest rReq = (PortletRequest) request;
@@ -80,7 +90,7 @@
+ rReq.getServerPort());
appContext = ConfigurationParser.getWikiContext();
-
+
if (appContext == null) {
appContext = rReq.getContextPath();
}
@@ -98,9 +108,15 @@
pageVersion = (rReq.getParameter("version") != null) ? Integer
.valueOf(rReq.getParameter("version")) : null;
-
- type = rReq.getParameter("type");
+ type = rReq.getParameter("type");
+
+ userDefaultLang = rReq.getPreferences().getValue(USER_LANG,
+ ConfigurationParser.getDefaultLangugeCode());
+
+ userDefaultPage = rReq.getPreferences().getValue(USER_PAGE,
+ ConfigurationParser.getDefaultPage());
+
} else {
throw new IllegalArgumentException("Unknow type request: "
+ request);
@@ -194,4 +210,54 @@
return type;
}
+ public String getUserDefaultLang() {
+ return userDefaultLang;
+ }
+
+ public String getUserDefaultPage() {
+ return userDefaultPage;
+ }
+
+ public void setUserDefaultLang(String lang, Object request)
+ throws WikiUserPreferenceException {
+
+ if (request instanceof PortletRequest) {
+ PortletRequest rReq = (PortletRequest) request;
+
+ try {
+ rReq.getPreferences().setValue(USER_LANG, lang);
+
+ rReq.getPreferences().store();
+
+ this.userDefaultLang = lang;
+ } catch (Exception e) {
+ throw new WikiUserPreferenceException(e);
+ }
+ } else {
+ throw new IllegalArgumentException("Unknow type request: "
+ + request);
+ }
+ }
+
+ public void setUserDefaultPage(String page, Object request)
+ throws WikiUserPreferenceException {
+
+ if (request instanceof PortletRequest) {
+ PortletRequest rReq = (PortletRequest) request;
+
+ try {
+ rReq.getPreferences().setValue(USER_PAGE, page);
+
+ rReq.getPreferences().store();
+
+ this.userDefaultPage = page;
+ } catch (Exception e) {
+ throw new WikiUserPreferenceException(e);
+ }
+ } else {
+ throw new IllegalArgumentException("Unknow type request: "
+ + request);
+ }
+ }
+
}
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/exception/WikiUserPreferenceException.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/exception/WikiUserPreferenceException.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/exception/WikiUserPreferenceException.java 2007-02-27 23:27:39 UTC (rev 9824)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.wiki.exception;
+
+import org.jboss.wiki.exceptions.WikiException;
+
+/**
+ * WikiUserPreferenceException.java
+ *
+ * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
+ */
+
+public class WikiUserPreferenceException extends WikiException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ public WikiUserPreferenceException(Exception e) {
+ super(e);
+ }
+
+ public WikiUserPreferenceException(String e) {
+ super(e);
+ }
+
+ public WikiUserPreferenceException() {
+ super();
+ }
+}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-02-27 22:18:49 UTC (rev 9823)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-02-27 23:27:39 UTC (rev 9824)
@@ -60,6 +60,8 @@
private static final Logger log = Logger
.getLogger(WikiPortletMyFaces.class);
+ private static final String EDIT_VIEW = "/views/wiki_preferences.xhtml";
+
protected void facesRender(RenderRequest request, RenderResponse response)
throws PortletException, java.io.IOException {
if (sessionTimedOut(request)
@@ -74,8 +76,18 @@
}
@Override
+ protected void doEdit(RenderRequest request, RenderResponse response) throws PortletException, IOException {
+ setPortletRequestFlag(request);
+
+ log.info("edit");
+ nonFacesRequest(request, response, EDIT_VIEW);
+ }
+
+ @Override
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
+ log.info(request.getParameter(VIEW_ID));
+
Map paramMap = request.getParameterMap();
for (String key : (Set<String>) paramMap.keySet()) {
@@ -245,7 +257,7 @@
private boolean paramMatches(String paramName) {
return (paramName.matches("var[123456789]\\d*") || paramName
- .equals("org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID"))
+ .equals(VIEW_ID))
|| (paramName.equals("type"))
|| (paramName.equals("page"))
|| (paramName.equals("language"));
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-02-27 22:18:49 UTC (rev 9823)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-02-27 23:27:39 UTC (rev 9824)
@@ -33,45 +33,53 @@
/**
* WikiCommonSession.java
- *
+ *
* @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
*/
public class WikiCommonSession {
private static final Logger log = Logger.getLogger(WikiCommonSession.class);
-
- private String pageName = ConfigurationParser.getDefaultPage();
-
- private String langCode = ConfigurationParser.getDefaultLangugeCode();
-
+
+ private String pageName;
+
+ private String langCode;
+
private Integer pageVersion = null;
-
+
private int pageToDiff;
-
+
private AttributesExtractor attrExtractor;
private Map<String, Integer> searchResults;
-
+
public WikiCommonSession() {
- attrExtractor = WikiHelper.getAttributesExtractor(WikiHelper.getRequest(),
- WikiHelper.getResponse());
-
+ attrExtractor = WikiHelper.getAttributesExtractor(WikiHelper
+ .getRequest(), WikiHelper.getResponse());
+
update(attrExtractor);
}
-
+
public void update(AttributesExtractor attrExtractor) {
if (attrExtractor.getRequestedPageName() != null) {
pageName = attrExtractor.getRequestedPageName();
log.info("Page name: " + pageName);
+ } else {
+ if ((pageName = attrExtractor.getUserDefaultPage()) == null) {
+ pageName = ConfigurationParser.getDefaultPage();
+ }
}
+
if (attrExtractor.getRequestedLanguage() != null) {
langCode = attrExtractor.getRequestedLanguage();
+ } else {
+ if ((langCode = attrExtractor.getUserDefaultLang()) == null) {
+ langCode = ConfigurationParser.getDefaultLangugeCode();
+ }
}
-
+
pageVersion = attrExtractor.getPageVersion();
}
-
public String getLangCode() {
return langCode;
}
@@ -91,7 +99,7 @@
public void setPageToDiff(int pageToDiff) {
this.pageToDiff = pageToDiff;
}
-
+
public boolean isUserLoggedIn() {
return attrExtractor.getCredentials().isLoggedIn();
}
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java 2007-02-27 23:27:39 UTC (rev 9824)
@@ -0,0 +1,156 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.wiki.ui;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.model.SelectItem;
+
+import org.jboss.logging.Logger;
+import org.jboss.wiki.attributesextractor.AttributesExtractor;
+import org.jboss.wiki.exception.WikiUserPreferenceException;
+import org.jboss.wiki.helper.WikiHelper;
+
+/**
+ * WikiPrefs.java
+ *
+ * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
+ */
+
+public class WikiPrefs {
+ private String lang;
+
+ private Set<SelectItem> allLangs;
+
+ private String defaultPage;
+
+ private Set<SelectItem> allPages;
+
+ private AttributesExtractor attrExtractor;
+
+ private final static Logger log = Logger.getLogger(WikiPrefs.class);
+
+ public WikiPrefs() {
+ attrExtractor = WikiHelper.getAttributesExtractor(WikiHelper
+ .getRequest(), WikiHelper.getResponse());
+
+ WikiHelper.getWikiCommonSession().update(attrExtractor);
+ }
+
+ public Set<SelectItem> getAllLangs() {
+ if (allLangs == null) {
+ allLangs = new TreeSet<SelectItem>(new Comparator<SelectItem>() {
+
+ public int compare(SelectItem o1, SelectItem o2) {
+ return o1.getLabel().compareTo(o2.getLabel());
+ }
+
+ });
+
+ Map<String, String> langMap = WikiHelper.getWikiEngine()
+ .getUsedLanguageCodes();
+
+ for (String lang : langMap.keySet()) {
+ allLangs.add(new SelectItem(lang, langMap.get(lang)));
+ }
+ }
+ return allLangs;
+ }
+
+ public void setAllLangs(Set<SelectItem> allLangs) {
+ this.allLangs = allLangs;
+ }
+
+ public Set<SelectItem> getAllPages() {
+ if (allPages == null) {
+ allPages = new TreeSet<SelectItem>(new Comparator<SelectItem>() {
+
+ public int compare(SelectItem o1, SelectItem o2) {
+ return o1.getLabel().compareTo(o2.getLabel());
+ }
+
+ });
+
+ Set<String> pages = WikiHelper.getWikiEngine().getAllPageNames(
+ getLang());
+
+ for (String page : pages) {
+ allPages.add(new SelectItem(page, page));
+ }
+ }
+ return allPages;
+ }
+
+ public void setAllPages(Set<SelectItem> allPages) {
+ this.allPages = allPages;
+ }
+
+ public String getDefaultPage() {
+ if (defaultPage == null) {
+ defaultPage = attrExtractor.getUserDefaultPage();
+ }
+ return defaultPage;
+ }
+
+ public void setDefaultPage(String defaultPage) {
+ this.defaultPage = defaultPage;
+ }
+
+ public String getLang() {
+ if (lang == null) {
+ lang = attrExtractor.getUserDefaultLang();
+ }
+ return lang;
+ }
+
+ public void setLang(String lang) {
+ this.lang = lang;
+ }
+
+ public void reload(ValueChangeEvent evt) {
+ allPages = null;
+ defaultPage = null;
+ lang = evt.getNewValue().toString();
+
+ log.info(lang);
+ }
+
+ public String save() {
+ if (defaultPage != null && lang != null) {
+ try {
+ attrExtractor.setUserDefaultLang(lang, WikiHelper.getRequest());
+ attrExtractor.setUserDefaultPage(defaultPage, WikiHelper
+ .getRequest());
+ } catch (WikiUserPreferenceException e) {
+ WikiHelper.addMessage(e.getMessage());
+ }
+ }
+
+ return "";
+ }
+}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-02-27 22:18:49 UTC (rev 9823)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-02-27 23:27:39 UTC (rev 9824)
@@ -110,10 +110,6 @@
}
public String getPageName() {
- if (WikiHelper.getWikiCommonSession().getPageName() == null) {
-
- }
-
return WikiHelper.getWikiCommonSession().getPageName();
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-02-27 22:18:49 UTC (rev 9823)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-02-27 23:27:39 UTC (rev 9824)
@@ -1,4 +1,4 @@
-edit_instruction = Here's a short reminder on what elements you have at your disposal:\n\n\n---- Horizontal ruler\n\\ Forced line break\n[link] Create hyperlink to "link", where "link" can be either an internal \n WikiName or an external link (http://)\n[text|link] Create a hyperlink where the link text is different from the actual \n hyperlink link.\n[text|wiki:link] Create a hyperlink where the link text is different from the \n actual hyperlink link, and the hyperlink points to a named Wiki. \n This supports interWiki linking.\n\n* Make a bulleted list (must be in first column). Use more (**) \n for deeper indentations.\n# Make a numbered list (must be in first column). Use more (##, ###) \n for deeper indentations.\n\n!, !!, !!! Start a line with an exclamation mark (!) to make a heading. \n !
More exclamation marks mean bigger headings.\n\n__text__ Makes text bold.\n''text'' Makes text in italics (notice that these are single quotes ('))\n{{text}} Makes text in monospaced font.\n;term:def Defines 'term' with 'def'. Use this with empty 'term' to make short comments.\n\n|text|more text| Makes a table. Double bars for a table heading.\n\nDon't try to use HTML, since it just won't work.\n\nTo embed images just put them available on the web using one of the approved formats, and they will get inlined automatically.\\nTo make a code block, use triple {'s to open, and triple }'s to close.
+edit_instruction = Here's a short reminder on what elements you have at your disposal:\n\n\n---- Horizontal ruler\n\\\\ Forced line break\n\\\\\\\\ Page break (printing)\n[link] Create hyperlink to "link", where "link" can be either an internal \n WikiName or an external link (http://)\n[text|link] Create a hyperlink where the link text is different from the actual \n hyperlink link.\n[text|wiki:link] Create a hyperlink where the link text is different from the \n actual hyperlink link, and the hyperlink points to a named Wiki. \n This supports interWiki linking.\n\n* Make a bulleted list (must be in first column). Use more (**) \n for deeper indentations.\n# Make a numbered list (must be in first column). Use more (##, ###) \n for deeper indentations.\n\n!, !!, !!! Start a line with an excla!
mation mark (!) to make a heading. \n More exclamation marks mean bigger headings.\n\n__text__ Makes text bold.\n''text'' Makes text in italics (notice that these are single quotes ('))\n{{text}} Makes text in monospaced font.\n;term:def Defines 'term' with 'def'. Use this with empty 'term' to make short comments.\n\n|text|more text| Makes a table. Double bars for a table heading.\n\nDon't try to use HTML, since it just won't work.\n\nTo embed images just put them available on the web using one of the approved formats, and they will get inlined automatically.\nTo make a code block, use triple {'s to open, and triple }'s to close.
edit_cancel = Cancel
edit_save = Save
permaLinkButton = permaLinkButton.png
@@ -33,3 +33,4 @@
print = Print
+save = Save
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2007-02-27 22:18:49 UTC (rev 9823)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2007-02-27 23:27:39 UTC (rev 9824)
@@ -23,6 +23,12 @@
</managed-bean>
<managed-bean>
+ <managed-bean-name>wikiPrefs</managed-bean-name>
+ <managed-bean-class>org.jboss.wiki.ui.WikiPrefs</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+
+ <managed-bean>
<managed-bean-name>wikiEdit</managed-bean-name>
<managed-bean-class>org.jboss.wiki.ui.WikiEdit</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
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 2007-02-27 22:18:49 UTC (rev 9823)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/portlet-instances.xml 2007-02-27 23:27:39 UTC (rev 9824)
@@ -7,4 +7,11 @@
<portlet-ref>WikiPortlet</portlet-ref>
</instance>
</deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-id>WikiPortletInstanceMyORG</instance-id>
+ <portlet-ref>WikiPortlet</portlet-ref>
+ </instance>
+ </deployment>
</deployments>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_preferences.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_preferences.xhtml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_preferences.xhtml 2007-02-27 23:27:39 UTC (rev 9824)
@@ -0,0 +1,22 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
+<ui:composition template="wiki_template.xhtml">
+
+ <ui:define name="content">
+ <h:form>
+ <h:selectOneMenu value="#{wikiPrefs.lang}" valueChangeListener="#{wikiPrefs.reload}" onchange="submit()" immediate="true">
+ <f:selectItems value="#{wikiPrefs.allLangs}" />
+ </h:selectOneMenu>
+ <h:selectOneMenu value="#{wikiPrefs.defaultPage}">
+ <f:selectItems value="#{wikiPrefs.allPages}" />
+ </h:selectOneMenu>
+ <h:commandLink action="#{wikiPrefs.save}" value="#{msg.save}" />
+ </h:form>
+ </ui:define>
+
+</ui:composition>
+</div>
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 2007-02-27 22:18:49 UTC (rev 9823)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java 2007-02-27 23:27:39 UTC (rev 9824)
@@ -674,6 +674,14 @@
int ch2 = nextToken();
if (ch2 == '\\') {
+ int ch3 = nextToken();
+
+ if (ch3 == '\\') {
+ return "<p style='page-break-before: always' />";
+ }
+
+ pushBack(ch3);
+
return "<BR clear=\"all\" />";
}
More information about the jboss-svn-commits
mailing list