[jboss-svn-commits] JBL Code SVN: r8936 - in labs/jbosslabs/trunk/portal-extensions: binaries/maven-repo-addons/facelets and 12 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jan 20 06:35:00 EST 2007
Author: szimano
Date: 2007-01-20 06:35:00 -0500 (Sat, 20 Jan 2007)
New Revision: 8936
Added:
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/el-api.jar
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/el-ri.jar
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/jsf-facelets-portlet.jar
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/jsf-facelets.jar
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/HistoryElement.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml
Modified:
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar
labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld
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/helper/WikiHelper.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/views/wiki_edit.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/wikiPlugins.properties
Log:
wiki changes and gwt 1.2
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/el-api.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/el-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/el-ri.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/el-ri.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/jsf-facelets-portlet.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/jsf-facelets-portlet.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/jsf-facelets.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/facelets/jars/jsf-facelets.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2007-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2007-01-20 11:35:00 UTC (rev 8936)
@@ -33,14 +33,13 @@
</goal>
<goal name="build">
- <!--<attainGoal name="buildGWT" />
+ <attainGoal name="buildGWT" />
- <attainGoal name="prj-war-build" />-->
+ <attainGoal name="prj-war-build" />
</goal>
<goal name="deploy">
- <!--<ant:copy file="target/tagme-servlet.war" toDir="${local.deploy.dir}" />-->
- <!--<ant:copy file="target/tagme-servlet.war" toDir="/home/tomek/jboss/park_rozrywki/server/default/deploy" />-->
+ <ant:copy file="target/tagme-servlet.war" toDir="${local.deploy.dir}" />
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml 2007-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml 2007-01-20 11:35:00 UTC (rev 8936)
@@ -26,9 +26,9 @@
<artifactId>gwt-user</artifactId>
<version>1.0</version>
<jar>gwt-user.jar</jar>
- <properties>
+ <!-- <properties>
<war.bundle>true</war.bundle>
- </properties>
+ </properties> -->
</dependency>
<dependency>
<groupId>google</groupId>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld 2007-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld 2007-01-20 11:35:00 UTC (rev 8936)
@@ -171,4 +171,25 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
+
+ <tag>
+ <name>ifEmpty</name>
+ <tagclass>org.jboss.forge.common.taglib.IfEmptyTag</tagclass>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>ifNotEmpty</name>
+ <tagclass>org.jboss.forge.common.taglib.IfNotEmptyTag</tagclass>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
</taglib>
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-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java 2007-01-20 11:35:00 UTC (rev 8936)
@@ -49,4 +49,8 @@
public String getRequestedPageName();
public String getRequestedLanguage();
+
+ public Integer getPageVersion();
+
+ public String getType();
}
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-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java 2007-01-20 11:35:00 UTC (rev 8936)
@@ -63,6 +63,10 @@
private String language;
+ private Integer pageVersion;
+
+ private String type;
+
public PortletAttributesExctractor(Object request) {
if (request instanceof PortletRequest) {
PortletRequest rReq = (PortletRequest) request;
@@ -87,6 +91,11 @@
language = rReq.getParameter("language");
+ pageVersion = (rReq.getParameter("version") != null) ? Integer
+ .valueOf(rReq.getParameter("version")) : null;
+
+ type = rReq.getParameter("type");
+
} else {
throw new IllegalArgumentException("Unknow type request: "
+ request);
@@ -118,7 +127,6 @@
if (response instanceof RenderResponse
&& request instanceof RenderRequest) {
RenderResponse portletResponse = (RenderResponse) response;
- RenderRequest portletRequest = (RenderRequest) request;
PortletURL portletURL;
if (isAction) {
@@ -148,8 +156,9 @@
throw new IllegalArgumentException(
"response and request should be instance of class "
+ RenderResponse.class + " and "
- + RenderRequest.class + " but are " + request.getClass()
- + " and " + response.getClass());
+ + RenderRequest.class + " but are "
+ + request.getClass() + " and "
+ + response.getClass());
}
}
@@ -172,4 +181,12 @@
return language;
}
+ public Integer getPageVersion() {
+ return pageVersion;
+ }
+
+ public String getType() {
+ return type;
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2007-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2007-01-20 11:35:00 UTC (rev 8936)
@@ -111,13 +111,4 @@
return (WikiCommonSession) fc.getApplication().createValueBinding(
WIKI_COMMON_SESSION).getValue(fc);
}
-
- public static UIOutput getText(String text) {
- UIOutput comp = (UIOutput) FacesContext.getCurrentInstance()
- .getApplication().createComponent(HtmlOutputText.COMPONENT_TYPE);
-
- comp.setValue(text);
-
- return comp;
- }
}
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/HistoryElement.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/HistoryElement.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/HistoryElement.java 2007-01-20 11:35:00 UTC (rev 8936)
@@ -0,0 +1,64 @@
+/*
+ * 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.Date;
+
+/**
+ * HistoryElement.java
+ *
+ * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
+ */
+
+public class HistoryElement {
+ private Integer version;
+
+ private String date;
+
+ private String author;
+
+ private String length;
+
+ public HistoryElement(int version, Date date, String author, long length) {
+ this.version = version;
+ this.date = date.toString();
+ this.author = author;
+ this.length = String.valueOf(length);
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public String getDate() {
+ return date;
+ }
+
+ public String getLength() {
+ return length;
+ }
+
+ public Integer getVersion() {
+ return version;
+ }
+}
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-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-01-20 11:35:00 UTC (rev 8936)
@@ -40,9 +40,18 @@
private String langCode = WikiEngine.defaultLangugeCode;
+ private Integer pageVersion = null;
+
+ private int pageToDiff;
+
public WikiCommonSession() {
AttributesExtractor 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);
@@ -50,15 +59,10 @@
if (attrExtractor.getRequestedLanguage() != null) {
langCode = attrExtractor.getRequestedLanguage();
}
+
+ pageVersion = attrExtractor.getPageVersion();
}
- public void setPageName(String requestedPageName) {
- pageName = requestedPageName;
- }
-
- public void setLangCode(String langCode) {
- this.langCode = langCode;
- }
public String getLangCode() {
return langCode;
@@ -67,4 +71,16 @@
public String getPageName() {
return pageName;
}
+
+ public Integer getPageVersion() {
+ return pageVersion;
+ }
+
+ public int getPageToDiff() {
+ return pageToDiff;
+ }
+
+ public void setPageToDiff(int pageToDiff) {
+ this.pageToDiff = pageToDiff;
+ }
}
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java 2007-01-20 11:35:00 UTC (rev 8936)
@@ -0,0 +1,87 @@
+/*
+ * 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 javax.faces.component.UIData;
+
+import org.jboss.logging.Logger;
+import org.jboss.wiki.WikiContext;
+import org.jboss.wiki.WikiEngine;
+import org.jboss.wiki.WikiPage;
+import org.jboss.wiki.WikiType;
+import org.jboss.wiki.attributesextractor.AttributesExtractor;
+import org.jboss.wiki.helper.WikiHelper;
+
+/**
+ * WikiDiff.java
+ *
+ * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
+ */
+
+public class WikiDiff {
+
+ private UIData historyTable;
+
+ private int thisVer;
+
+ private AttributesExtractor attrExtractor;
+
+ private final static Logger log = Logger.getLogger(WikiDiff.class);
+
+ public WikiDiff() {
+ attrExtractor = WikiHelper.getAttributesExtractor(WikiHelper
+ .getRequest(), WikiHelper.getResponse());
+
+ WikiHelper.getWikiCommonSession().update(attrExtractor);
+ }
+
+ public UIData getHistoryTable() {
+ return historyTable;
+ }
+
+ public void setHistoryTable(UIData historyTable) {
+ this.historyTable = historyTable;
+ }
+
+ public String diff() {
+ HistoryElement elem = (HistoryElement) historyTable.getRowData();
+
+ WikiHelper.getWikiCommonSession().setPageToDiff(elem.getVersion());
+
+ return "diff";
+ }
+
+ public String getDiff() {
+ WikiEngine engine = WikiHelper.getWikiEngine();
+ WikiType wikiType = WikiHelper.getWikiEngine().getWikiType("diff");
+ WikiContext wikiContext = new WikiContext(attrExtractor
+ .getCredentials(), wikiType, attrExtractor.getWikiSession());
+
+ WikiPage page = engine.getByName(WikiHelper.getWikiCommonSession()
+ .getPageName(), wikiContext, WikiHelper.getWikiCommonSession().getPageToDiff(), WikiHelper
+ .getWikiCommonSession().getLangCode());
+
+ return page.getContent();
+ }
+
+}
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-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-01-20 11:35:00 UTC (rev 8936)
@@ -23,13 +23,8 @@
package org.jboss.wiki.ui;
import java.util.List;
+import java.util.Vector;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIOutput;
-import javax.faces.component.UIPanel;
-import javax.faces.component.html.HtmlPanelGrid;
-import javax.faces.context.FacesContext;
-
import org.jboss.logging.Logger;
import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiContext;
@@ -56,14 +51,7 @@
attrExtractor = WikiHelper.getAttributesExtractor(WikiHelper
.getRequest(), WikiHelper.getResponse());
- if (attrExtractor.getRequestedPageName() != null) {
- WikiHelper.getWikiCommonSession().setPageName(
- attrExtractor.getRequestedPageName());
- }
- if (attrExtractor.getRequestedLanguage() != null) {
- WikiHelper.getWikiCommonSession().setLangCode(
- attrExtractor.getRequestedLanguage());
- }
+ WikiHelper.getWikiCommonSession().update(attrExtractor);
}
public String getWikiImagesURL() {
@@ -99,38 +87,62 @@
}
private WikiPage getCurrentPage() {
+
+ String type = "html";
+
+ if (attrExtractor.getType() != null) {
+ type = attrExtractor.getType();
+ }
+
if (currentPage == null) {
- WikiType wikiType = WikiHelper.getWikiEngine().getWikiType("html");
+ WikiType wikiType = WikiHelper.getWikiEngine().getWikiType(type);
WikiContext wikiContext = new WikiContext(attrExtractor
.getCredentials(), wikiType, attrExtractor.getWikiSession());
- currentPage = WikiHelper.getWikiEngine().getByName(
- WikiHelper.getWikiCommonSession().getPageName(),
- wikiContext,
- WikiHelper.getWikiCommonSession().getLangCode());
+ if (WikiHelper.getWikiCommonSession().getPageVersion() != null) {
+ currentPage = WikiHelper.getWikiEngine().getByName(
+ WikiHelper.getWikiCommonSession().getPageName(),
+ wikiContext,
+ WikiHelper.getWikiCommonSession().getPageVersion(),
+ WikiHelper.getWikiCommonSession().getLangCode());
+ } else {
+ currentPage = WikiHelper.getWikiEngine().getByName(
+ WikiHelper.getWikiCommonSession().getPageName(),
+ wikiContext,
+ WikiHelper.getWikiCommonSession().getLangCode());
+
+ }
+
}
return currentPage;
}
- public UIPanel getHistoryTable() {
- UIPanel hTable = (UIPanel) FacesContext.getCurrentInstance()
- .getApplication().createComponent(HtmlPanelGrid.COMPONENT_TYPE);
+ public List<HistoryElement> getHistoryTable() {
+ List<HistoryElement> hisList = new Vector<HistoryElement>();
- List children = hTable.getChildren();
-
WikiEngine engine = WikiHelper.getWikiEngine();
WikiPage currentPage = getCurrentPage();
for (int i = currentPage.getLastVersion(); i > 0; i--) {
- WikiPage histPage = engine.getPageAtVersion(currentPage, true, i, currentPage.getLangCode());
- children.add(WikiHelper.getText(String.valueOf(i)));
- children.add(WikiHelper.getText(histPage.getEditDate().toString()));
- children.add(WikiHelper.getText(histPage.getLastAuthor().getName()));
- children.add(WikiHelper.getText(String.valueOf(histPage.getLength())));
+ WikiPage histPage = engine.getPageAtVersion(currentPage, true, i,
+ currentPage.getLangCode());
+
+ hisList.add(new HistoryElement(i, histPage.getEditDate(), histPage
+ .getLastAuthor().getName(), histPage.getLength()));
}
- return hTable;
+ return hisList;
}
+ public boolean isOtherVersion() {
+ if (WikiHelper.getWikiCommonSession().getPageVersion() != null) {
+ if (getCurrentPage().getLastVersion() != WikiHelper.getWikiCommonSession().getPageVersion()) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
}
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-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-01-20 11:35:00 UTC (rev 8936)
@@ -4,4 +4,14 @@
permaLinkButton = permaLinkButton.png
editButton = editButton.png
historyButton = historyButton.png
-historytitle = History of page :
\ No newline at end of file
+historytitle = History of page :
+version = Version
+date = Date
+author = Author
+size = Size
+changesFromPrev = Changes from previous
+goback = Go back
+thisIsVer = This is version
+ofPage = of page
+changesBetween = Changes between versions
+andChng = and
\ No newline at end of file
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-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2007-01-20 11:35:00 UTC (rev 8936)
@@ -30,6 +30,12 @@
</managed-bean>
<managed-bean>
+ <managed-bean-name>wikiDiff</managed-bean-name>
+ <managed-bean-class>org.jboss.wiki.ui.WikiDiff</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+
+ <managed-bean>
<managed-bean-name>wikiCommon</managed-bean-name>
<managed-bean-class>org.jboss.wiki.ui.WikiCommonSession</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
@@ -60,9 +66,17 @@
</navigation-rule>
<navigation-rule>
- <from-view-id>/views/wiki_edit.xhtml</from-view-id>
+ <from-view-id>/views/wiki_history.xhtml</from-view-id>
<navigation-case>
- <from-outcome>cancel</from-outcome>
+ <from-outcome>diff</from-outcome>
+ <to-view-id>/views/wiki_diff.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>goback</from-outcome>
<to-view-id>/views/wiki_view.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml 2007-01-20 11:35:00 UTC (rev 8936)
@@ -0,0 +1,21 @@
+<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">
+<ui:composition template="wiki_template.xhtml">
+
+ <ui:define name="content">
+ <h:panelGroup styleClass="wikiDiff">
+ <h:outputText value="#{wikiDiff.diff}" escape="false"/>
+ </h:panelGroup>
+
+ <h:form>
+ <h:commandLink action="goback">
+ <h:outputText value="#{msg.goback}" />
+ </h:commandLink>
+ </h:form>
+ </ui:define>
+
+</ui:composition>
+</div>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2007-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2007-01-20 11:35:00 UTC (rev 8936)
@@ -11,7 +11,7 @@
<h:inputTextarea rows="40" cols="80" value="#{wikiEdit.pageContent}" styleClass="editPageArea" acceptcharset="UTF-8" />
<h:panelGroup>
<h:commandButton value="#{msg.edit_save}" action="#{wikiEdit.save}" />
- <h:commandButton value="#{msg.edit_cancel}" action="cancel" />
+ <h:commandButton value="#{msg.edit_cancel}" action="goback" />
</h:panelGroup>
</h:panelGrid>
<h:inputHidden value="#{wikiEdit.editSessionId}" />
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2007-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2007-01-20 11:35:00 UTC (rev 8936)
@@ -1,21 +1,57 @@
-<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">
-<ui:composition template="wiki_template.xhtml">
-
- <ui:define name="content">
- <h:panelGrid columns="4" binding="#{wikiView.historyTable}" >
- <f:facet name="header">
- <h:outputText value="#{msg.historytitle} #{wikiCommon.pageName}"/>
- </f:facet>
- <f:facet name="header">
- <h:outputText value="#{msg.historytitle} #{wikiCommon.pageName}"/>
- </f:facet>
- </h:panelGrid>
- </ui:define>
+<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"><ui:composition
+ template="wiki_template.xhtml">
-</ui:composition>
+ <ui:define name="content">
-</div>
+ <h:dataTable id="history" value="#{wikiView.historyTable}" var="hisElem" binding="#{wikiDiff.historyTable}" >
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{msg.version}" />
+ </f:facet>
+ <h:outputLink value="#{wikiView.wikiFriendlyURL}:#{hisElem.version}">
+ <h:outputText value="#{hisElem.version}" />
+ </h:outputLink>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{msg.date}" />
+ </f:facet>
+ <h:outputText value="#{hisElem.date}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{msg.author}" />
+ </f:facet>
+ <h:outputText value="#{hisElem.author}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{msg.size}" />
+ </f:facet>
+ <h:outputText value="#{hisElem.length}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{msg.changesFromPrev}" />
+ </f:facet>
+ <h:form>
+
+ <h:commandLink action="#{wikiDiff.diff}" rendered="#{hisElem.version > 1}" >
+ <h:outputText value="#{msg.changesBetween} #{hisElem.version - 1} #{msg.andChng} #{hisElem.version}" />
+ </h:commandLink>
+ </h:form>
+ </h:column>
+ </h:dataTable>
+
+ <h:form>
+ <h:commandLink action="goback">
+ <h:outputText value="#{msg.goback}" />
+ </h:commandLink>
+ </h:form>
+ </ui:define>
+
+</ui:composition></div>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-01-20 11:35:00 UTC (rev 8936)
@@ -28,6 +28,13 @@
</h:panelGroup>
</h:panelGrid>
+ <h:panelGroup styleClass="otherVersionBox" rendered="#{wikiView.otherVersion}" >
+ <h:outputText value="#{msg.thisIsVer} #{wikiCommon.pageVersion} #{msg.ofPage} " />
+ <h:outputLink value="#{wikiView.wikiFriendlyURL}">
+ <h:outputText value="#{wikiCommon.pageName}" />
+ </h:outputLink>
+ </h:panelGroup>
+
<hr />
<h:panelGroup styleClass="wikiContent">
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css 2007-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css 2007-01-20 11:35:00 UTC (rev 8936)
@@ -15,4 +15,11 @@
.editPageArea {
width: 100%;
+}
+
+.otherVersionBox {
+ border: 2px dashed red;
+ text-align: center;
+ border-left: auto;
+ border-right: auto;
}
\ No newline at end of file
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 2007-01-20 11:23:58 UTC (rev 8935)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/org/jboss/wiki/wikiPlugins.properties 2007-01-20 11:35:00 UTC (rev 8936)
@@ -7,7 +7,7 @@
#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/portal/default/wiki/WikiPortletWindow?action=1
-wikiHome = /portal/portal/default/wiki/WikiPortletWindow?action=2&org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=%2Fviews%2Findex.xhtml
+wikiHome = /portal/portal/default/wiki/WikiPortletWindow?action=1&org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID=%2Fviews%2Fwiki_view.xhtml
#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