[jboss-svn-commits] JBL Code SVN: r9898 - in labs/jbosslabs/trunk/portal-extensions: forge-mapper/src/java/org/jboss/labs/mapper/url and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Mar 1 19:47:16 EST 2007
Author: szimano
Date: 2007-03-01 19:47:15 -0500 (Thu, 01 Mar 2007)
New Revision: 9898
Added:
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar
Removed:
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/PUT_GWT_DEV_LINUX_JAR_HERE
Modified:
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java
labs/jbosslabs/trunk/portal-extensions/forge-speller/src/java/org/jboss/labs/speller/SpellerServlet.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml
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/WikiEdit.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/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_template.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/java/org/jboss/wiki/WikiPage.java
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
wiki bugs and features, speller and tagme tryouts
Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/PUT_GWT_DEV_LINUX_JAR_HERE
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/PUT_GWT_DEV_LINUX_JAR_HERE 2007-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/PUT_GWT_DEV_LINUX_JAR_HERE 2007-03-02 00:47:15 UTC (rev 9898)
@@ -1 +0,0 @@
-http://code.google.com/webtoolkit/download.html
Added: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.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-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java 2007-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java 2007-03-02 00:47:15 UTC (rev 9898)
@@ -57,7 +57,7 @@
(PortletParametersStateString) navigationalState;
if (ppss.getValue("language") != null) {
- addTokenToPath(sb, ppss.getValue("language"));
+ addTokenToPath(sb, ppss.getValue("language").toLowerCase());
}
if (ppss.getValue("page") != null) {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-speller/src/java/org/jboss/labs/speller/SpellerServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-speller/src/java/org/jboss/labs/speller/SpellerServlet.java 2007-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/forge-speller/src/java/org/jboss/labs/speller/SpellerServlet.java 2007-03-02 00:47:15 UTC (rev 9898)
@@ -59,8 +59,6 @@
private String word_win_src = "/speller/pages/wordWindow.js";
- private String pageLocation = "/home/tomek/tmp/spellerpages-0.5.1/speller/";
-
private String[] textinputs = null; // $_POST['textinputs']; # array
private String aspell_prog = "aspell";
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2007-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2007-03-02 00:47:15 UTC (rev 9898)
@@ -20,7 +20,7 @@
<ant:arg value="-out" />
<ant:arg value="target/tagme-servlet/www" />
<ant:arg value="org.jboss.labs.tagme.gwt.TagMe" />
- </ant:java>
+ </ant:java>-->
<ant:exec executable="java" >
<ant:arg value="-cp" />
@@ -29,7 +29,9 @@
<ant:arg value="-out" />
<ant:arg value="target/tagme-servlet/www" />
<ant:arg value="org.jboss.labs.tagme.gwt.TagMe" />
- </ant:exec>-->
+ </ant:exec>
+
+ <ant:copy file="../binaries/maven-repo-addons/google/jars/gwt-user.jar" toFile="target/gwt-user.jar" />
</goal>
<goal name="build">
@@ -39,7 +41,7 @@
</goal>
<goal name="deploy">
- <!--<attainGoal name="prj-war-deploy" />-->
+ <attainGoal name="prj-war-deploy" />
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml 2007-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml 2007-03-02 00:47:15 UTC (rev 9898)
@@ -27,8 +27,8 @@
<version>1.0</version>
<jar>gwt-user.jar</jar>
<!-- <properties>
- <war.bundle>true</war.bundle>
- </properties> -->
+ <war.bundle>true</war.bundle>
+ </properties> -->
</dependency>
<dependency>
<groupId>google</groupId>
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-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2007-03-02 00:47:15 UTC (rev 9898)
@@ -41,6 +41,7 @@
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.attributesextractor.PortletAttributesExctractor;
+import org.jboss.wiki.configuration.ConfigurationParser;
import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
import org.jboss.wiki.management.WikiServiceManagement;
import org.jboss.wiki.ui.WikiCommonSession;
@@ -60,9 +61,9 @@
private static final String WIKI_COMMON_SESSION = "#{wikiCommon}";
private static final String BUNDLE_NAME = "Messages";
-
+
private static ThreadLocal<File> file = new ThreadLocal<File>();
-
+
private static ThreadLocal<String> fileName = new ThreadLocal<String>();
public static WikiEngine getWikiEngine() {
@@ -148,27 +149,34 @@
return resourceStr;
}
-
+
public static void setFile(File f) {
file.set(f);
}
-
+
public static File getFile() {
File f = file.get();
-
+
file.set(null);
-
+
return f;
}
public static void setFileName(String fn) {
fileName.set(fn);
}
-
+
public static String getFileName() {
String fn = fileName.get();
fileName.set(null);
-
+
return fn;
}
+
+ public static String writeLangLink(String langCode) {
+ if (!langCode.equals(ConfigurationParser.getDefaultLangugeCode())) {
+ return langCode + "/";
+ } else
+ return "";
+ }
}
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-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-03-02 00:47:15 UTC (rev 9898)
@@ -64,7 +64,8 @@
pageName = attrExtractor.getRequestedPageName();
log.info("Page name: " + pageName);
} else {
- if ((pageName = attrExtractor.getUserDefaultPage()) == null) {
+ if (pageName == null
+ && (pageName = attrExtractor.getUserDefaultPage()) == null) {
pageName = ConfigurationParser.getDefaultPage();
}
}
@@ -88,6 +89,10 @@
return pageName;
}
+ public String getUserName() {
+ return attrExtractor.getCredentials().getName();
+ }
+
public Integer getPageVersion() {
return pageVersion;
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-03-02 00:47:15 UTC (rev 9898)
@@ -25,6 +25,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -37,6 +38,7 @@
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
+import org.jboss.wiki.configuration.ConfigurationParser;
import org.jboss.wiki.exceptions.EditSessionExpired;
import org.jboss.wiki.exceptions.EditingNotAllowedException;
import org.jboss.wiki.exceptions.WikiSaveException;
@@ -69,11 +71,27 @@
.getRequest(), WikiHelper.getResponse());
editSessionId = WikiHelper.getWikiEngine().getEditSessionId();
- Date lock = getWikiPage().lock(attributesExtractor.getCredentials(),
+
+ WikiPage pageToEdit = getWikiPage(true);
+
+ Date lock = pageToEdit.lock(attributesExtractor.getCredentials(),
editSessionId);
-
+ log.debug("Lock: " + lock);
if (lock != null) {
+ String user = pageToEdit.getLockUser();
+ Calendar endCal = Calendar.getInstance();
+ endCal.setTime(lock);
+ endCal.add(Calendar.MINUTE, ConfigurationParser.getLockTime());
+
+ Date endDate = endCal.getTime();
+
+ lockMsg = WikiHelper.getMessage("page_edited_by") + user + ". "
+ + WikiHelper.getMessage("lock_started") + lock.toString()
+ + ". " + WikiHelper.getMessage("edit_session_invalidated")
+ + endDate.toString() + ". "
+ + WikiHelper.getMessage("stop_you_edit") + ".";
+
} else {
lockMsg = "";
}
@@ -88,14 +106,18 @@
}
private WikiPage getWikiPage() {
+ return getWikiPage(false);
+ }
+
+ private WikiPage getWikiPage(boolean getDirect) {
WikiEngine wikiEngine = WikiHelper.getWikiEngine();
WikiContext wikiContext = new WikiContext(attributesExtractor
.getCredentials(), wikiEngine.getWikiType("edit"),
attributesExtractor.getWikiSession());
return wikiEngine.getByName(WikiHelper.getWikiCommonSession()
- .getPageName(), wikiContext, WikiHelper.getWikiCommonSession()
- .getLangCode());
+ .getPageName(), getDirect ? null : wikiContext, WikiHelper
+ .getWikiCommonSession().getLangCode());
}
public String save() {
@@ -107,7 +129,7 @@
WikiHelper.getWikiCommonSession().getLangCode(),
attributesExtractor.getWikiSession(), pageContent);
- getWikiPage().unlock(attributesExtractor.getCredentials(),
+ getWikiPage(true).unlock(attributesExtractor.getCredentials(),
editSessionId);
} catch (EditSessionExpired e) {
@@ -204,7 +226,7 @@
}
public String cancel() {
- getWikiPage().unlock(attributesExtractor.getCredentials(),
+ getWikiPage(true).unlock(attributesExtractor.getCredentials(),
editSessionId);
return "goback";
Modified: 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 2007-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java 2007-03-02 00:47:15 UTC (rev 9898)
@@ -146,11 +146,12 @@
attrExtractor.setUserDefaultLang(lang, WikiHelper.getRequest());
attrExtractor.setUserDefaultPage(defaultPage, WikiHelper
.getRequest());
+ WikiHelper.addMessage(WikiHelper.getMessage("prefsSaved"));
} catch (WikiUserPreferenceException e) {
WikiHelper.addMessage(e.getMessage());
}
}
- return "";
+ return "saved";
}
}
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-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-03-02 00:47:15 UTC (rev 9898)
@@ -209,9 +209,6 @@
attrExtractor.getWikiSession().setAttribute(FIND_ATTRIBUTE, pages);
- // show the results
- // rResp.setRenderParameter("page", "FindResult");
-
return "";
}
@@ -231,8 +228,14 @@
+ getCurrentPage().getName()
+ "', 'printerfriendly', 'menubar=no,toolbar=no,location=no,directories=no,status=no,scrollbars=yes,resizable=no,fullscreen=no,channelmode=no'); return false";
- log.info(print);
-
return print;
}
+
+ public String getLastAuthor() {
+ return getCurrentPage().getLastAuthor().getName();
+ }
+
+ public String getDate() {
+ return getCurrentPage().getEditDate().toString();
+ }
}
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-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-03-02 00:47:15 UTC (rev 9898)
@@ -1,6 +1,7 @@
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
+edit_spellcheck = Check Spelling
permaLinkButton = permaLinkButton.png
editButton = editButton.png
@@ -12,6 +13,8 @@
rdfButton = RDFButton.gif
atomButton = ATOMButton.gif
+pageLastChanged = The page last changed on
+by = by
historytitle = History of page :
version = Version
@@ -34,3 +37,9 @@
print = Print
save = Save
+prefsSaved = Preferences saved
+
+page_edited_by = I'm sorry, but this page is currently edited by:
+lock_started = Lock started:
+edit_session_invalidated = It will be invalidated on:
+stop_you_edit = I won't stop you from editing this page but consider that your changes might be lost
\ 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-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2007-03-02 00:47:15 UTC (rev 9898)
@@ -79,6 +79,14 @@
</navigation-rule>
<navigation-rule>
+ <from-view-id>/views/wiki_preferences.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>saved</from-outcome>
+ <to-view-id>/views/wiki_preferences.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
<from-view-id>*</from-view-id>
<navigation-case>
<from-outcome>goback</from-outcome>
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-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2007-03-02 00:47:15 UTC (rev 9898)
@@ -6,12 +6,14 @@
<ui:composition template="wiki_template.xhtml">
<ui:define name="content">
+ <h:outputText value="#{wikiEdit.lockMsg}" styleClass="pageLocked" />
<h:form>
<h:panelGrid>
<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="#{wikiEdit.cancel}" />
+ <h:commandButton value="#{msg.edit_spellcheck}" onclick="openSpellChecker(); return false;" />
</h:panelGroup>
</h:panelGrid>
<h:inputHidden value="#{wikiEdit.editSessionId}" />
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2007-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2007-03-02 00:47:15 UTC (rev 9898)
@@ -10,6 +10,14 @@
<head>
<title></title>
<link rel="stylesheet" href="#{wikiView.wikiImagesURL}wikiStyle.css" type="text/css" media="all" />
+ <c:if test="#{wikiCommon.userLoggedIn}">
+ <meta name='gwt:property' content='tagMeSet/wiki/#{wikiCommon.pageName}=/wiki/#{wikiCommon.pageName}' />
+ <meta name='gwt:property' content='tagMeDiv/wiki/#{wikiCommon.pageName}=tagMeWiki' />
+ <meta name='gwt:property' content='tagMePath/wiki/#{wikiCommon.pageName}=/wiki/#{wikiCommon.pageName}' />
+ <meta name='gwt:property' content='tagMeUser/wiki/#{wikiCommon.pageName}=#{wikiCommon.userName}' />
+ <meta name='gwt:property' content='tagMeClass/wiki/#{wikiCommon.pageName}=org.jboss.labs.tagme.services.ShotokuTaggingService' />
+ <meta name='gwt:property' content='tagMeWebsite/wiki/#{wikiCommon.pageName}=true' />
+ </c:if>
</head>
<body class="wiki-body">
<h:panelGrid>
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-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-03-02 00:47:15 UTC (rev 9898)
@@ -6,6 +6,11 @@
<ui:composition template="wiki_template.xhtml">
<ui:define name="content">
+
+ <h:panelGroup rendered="#{wikiCommon.userLoggedIn}" id="tagMeWiki">
+
+ </h:panelGroup>
+
<h:panelGrid columns="2">
<h:panelGroup>
<h:outputLink value="#{wikiView.wikiFriendlyURL}">
@@ -67,6 +72,10 @@
<h:panelGroup styleClass="wikiContent">
<h:outputText value="#{wikiView.pageContent}" escape="false"/>
</h:panelGroup>
+
+ <hr />
+
+ <h:outputText styleClass="lastEdited" value="#{msg.pageLastChanged} #{wikiView.date} #{msg.by} #{wikiView.lastAuthor}" />
</ui:define>
</ui:composition>
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-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css 2007-03-02 00:47:15 UTC (rev 9898)
@@ -22,4 +22,12 @@
text-align: center;
border-left: auto;
border-right: auto;
+}
+
+.pageLocked {
+ color: red;
+}
+
+.lastEdited {
+
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java 2007-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java 2007-03-02 00:47:15 UTC (rev 9898)
@@ -98,8 +98,6 @@
private WikiEngine wikiEngine;
- public WikiEngine wikiEngine_1;
-
private String pageContent;
private boolean editable;
@@ -143,16 +141,30 @@
}
+ public WikiPage(String name2, Credentials lastAuthor2, String pageContent2,
+ int lastVersion2, int version2, Date editDate2,
+ WikiEngine wikiEngine2, boolean viewable2, boolean editable2,
+ Set<String> editRoles2, Set<String> viewRoles2, long length2,
+ String langCode, Date lockTime2, String lockUser2) {
+ this(name2, lastAuthor2, pageContent2, lastVersion2, version2,
+ editDate2, wikiEngine2, viewable2, editable2, editRoles2,
+ viewRoles2, length2, langCode);
+
+ this.lockTime = lockTime2;
+ this.lockUser = lockUser2;
+ }
+
public synchronized void save(Credentials credentials,
- Integer editActionId, String langCode, WikiSession wikiSession, String newContent) throws EditSessionExpired,
- WikiSaveException, EditingNotAllowedException {
+ Integer editActionId, String langCode, WikiSession wikiSession,
+ String newContent) throws EditSessionExpired, WikiSaveException,
+ EditingNotAllowedException {
if (expiredSessionIds.contains(editActionId)) {
throw new EditSessionExpired(
"Your edit session have expired. Please edit page once again !");
}
-
- // set new content
+
+ // set new content
setContent(newContent);
// set author name for new version
@@ -257,7 +269,7 @@
WikiPage clonedPage = new WikiPage(getName(), getLastAuthor(),
getPageContent(), getLastVersion(), getVersion(),
getEditDate(), wikiEngine, viewable, editable, editRoles,
- viewRoles, length, getLangCode());
+ viewRoles, length, getLangCode(), lockTime, lockUser);
// copy tempVariables as they are temp only...
clonedPage.setTempVariables(new HashMap<String, Object>(tempVariables));
@@ -299,7 +311,8 @@
Calendar calExpireDate = Calendar.getInstance();
calExpireDate.setTime(this.lockTime);
- calExpireDate.add(Calendar.MINUTE, ConfigurationParser.getLockTime());
+ calExpireDate.add(Calendar.MINUTE, ConfigurationParser
+ .getLockTime());
expDate = calExpireDate.getTime();
if (expDate.before(now)) {
@@ -315,7 +328,7 @@
// page isn't locked or lock expired. Lets lock it.
this.lockTime = now;
this.lockUser = user.getName();
- log.debug("LOCK: " + lockUser);
+ log.info("LOCK: " + lockUser);
retDate = null;
}
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-03-01 23:21:35 UTC (rev 9897)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-03-02 00:47:15 UTC (rev 9898)
@@ -156,7 +156,7 @@
<window>
<window-name>WikiPortletWindow</window-name>
- <instance-ref>WikiPortletInstance</instance-ref>
+ <instance-ref>WikiPortletInstanceMyORG</instance-ref>
<region>triple</region>
<height>0</height>
</window>
More information about the jboss-svn-commits
mailing list