[jboss-cvs] jboss-seam/examples/wiki/src/etc ...
Christian Bauer
christian at hibernate.org
Wed Jan 9 10:59:26 EST 2008
User: cbauer
Date: 08/01/09 10:59:26
Modified: examples/wiki/src/etc ehcache.xml import-prod.sql
messages_en.properties
Log:
JBSEAM-2397 and JBSEAM-1883 - implemented trashcan feature and more reliable update of 2nd level cache and lucene index
Revision Changes Path
1.6 +10 -2 jboss-seam/examples/wiki/src/etc/ehcache.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ehcache.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/ehcache.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ehcache.xml 30 Dec 2007 02:33:23 -0000 1.5
+++ ehcache.xml 9 Jan 2008 15:59:26 -0000 1.6
@@ -103,6 +103,15 @@
diskPersistent="false"
overflowToDisk="false"/>
+ <cache name="WikiNode"
+ maxElementsInMemory="1000"
+ eternal="false"
+ overflowToDisk="false"
+ timeToIdleSeconds="1000"
+ timeToLiveSeconds="6000"
+ diskPersistent="false"
+ memoryStoreEvictionPolicy="LRU"/>
+
<cache name="WikiPreference"
maxElementsInMemory="20000"
eternal="false"
@@ -121,7 +130,6 @@
diskPersistent="false"
memoryStoreEvictionPolicy="LRU"/>
-<!-- TODO: Cascade delete
<cache name="WikiFeed"
maxElementsInMemory="100"
eternal="false"
@@ -148,7 +156,7 @@
timeToLiveSeconds="259200"
diskPersistent="false"
memoryStoreEvictionPolicy="LRU"/>
--->
+
<cache name="WikiUser"
maxElementsInMemory="5000"
eternal="false"
1.26 +1 -0 jboss-seam/examples/wiki/src/etc/import-prod.sql
(In the diff below, changes in quantity of whitespace are not shown.)
Index: import-prod.sql
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/import-prod.sql,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- import-prod.sql 4 Jan 2008 00:21:28 -0000 1.25
+++ import-prod.sql 9 Jan 2008 15:59:26 -0000 1.26
@@ -18,6 +18,7 @@
INSERT INTO PREFERENCE VALUES(15,'Wiki','showDocumentCreatorHistory',NULL,NULL,NULL,TRUE,NULL,0,NULL)
INSERT INTO PREFERENCE VALUES(16,'Wiki','showTags',NULL,NULL,NULL,TRUE,NULL,0,NULL)
INSERT INTO PREFERENCE VALUES(17,'Wiki','showEmailToLoggedInOnly',NULL,NULL,NULL,TRUE,NULL,0,NULL)
+INSERT INTO PREFERENCE VALUES(18,'Wiki','trashArea',NULL,NULL,NULL,NULL,'Trash',0,NULL)
INSERT INTO PREFERENCE VALUES(20,'DocEditor','minorRevisionEnabled',NULL,NULL,NULL,TRUE,NULL,0,NULL)
INSERT INTO PREFERENCE VALUES(21,'DocEditor','regularEditAreaRows',15,NULL,NULL,NULL,NULL,0,NULL)
INSERT INTO PREFERENCE VALUES(22,'DocEditor','regularEditAreaColumns',65,NULL,NULL,NULL,NULL,0,NULL)
1.16 +6 -0 jboss-seam/examples/wiki/src/etc/messages_en.properties
(In the diff below, changes in quantity of whitespace are not shown.)
Index: messages_en.properties
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/messages_en.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- messages_en.properties 4 Jan 2008 22:28:52 -0000 1.15
+++ messages_en.properties 9 Jan 2008 15:59:26 -0000 1.16
@@ -120,6 +120,7 @@
lacewiki.button.EditWikiRoot=<u>E</u>dit Wiki Root
lacewiki.button.EditWikiRoot.accesskey=E
lacewiki.button.Edit=Edit
+lacewiki.button.EmptyTrash=Empty Trash
lacewiki.button.SwitchWorkspace=Switch <u>W</u>orkspace
lacewiki.button.SwitchWorkspace.accesskey=W
@@ -590,6 +591,7 @@
lacewiki.msg.Comment.Persist=Comment '{0}' has been saved.
lacewiki.msg.Comment.Update=Comment '{0}' has been updated.
lacewiki.msg.Comment.Delete=Comment '{0}' has been deleted.
+lacewiki.msg.Node.Trashed='{0}' has been moved into the trash.
# Entity validation
@@ -619,6 +621,8 @@
lacewiki.msg.RollingBackDocument=Rolling document back to revision {0}.
lacewiki.msg.NoUserFound=No user with given attributes was found, please try again.
lacewiki.msg.MemberHomedirectoryNotFound=Could not find member area with name {0} - your configuration is broken, please change it.
+lacewiki.msg.TrashAreaNotFound=Could not find trash area with name {0} - your configuration is broken, please change it.
+lacewiki.msg.HelpAreaNotFound=Could not find help area with name {0} - your configuration is broken, please change it.
lacewiki.msg.ImportSkippingDirectory=Skipping directory '{0}', importing not supported...
lacewiki.msg.ImportDuplicateName=Skipping file '{0}', name is already used in this area...
lacewiki.msg.ImportInvalidNode=Skipping entry '{0}', invalid: {1}
@@ -626,6 +630,7 @@
lacewiki.msg.OptimisticLockError=Someone modified the same record while you were editing it. Please restart your workspace.
lacewiki.msg.AccessDenied=Access Denied
lacewiki.msg.FatalError=An unrecoverable error occured!
+lacewiki.msg.Trash.Emptied=All items in the trash have been permanently deleted.
# Preferences Editors
lacewiki.preferences.editor.SelectNone=(None)
@@ -639,6 +644,7 @@
lacewiki.preferences.wiki.ThemeName=Theme directory name
lacewiki.preferences.wiki.MemberArea=Wiki area for user home directories
lacewiki.preferences.wiki.HelpArea=Wiki area containing help texts
+lacewiki.preferences.wiki.TrashArea=Wiki area used as trash
lacewiki.preferences.wiki.DefaultDocumentId=Identifier of the default start document of the Wiki
lacewiki.preferences.wiki.RenderPermLinks=Render permanent links by default (or /Wiki/WordLinks)
lacewiki.preferences.wiki.PermLinkSuffix=Append this suffix to permanent identifier
More information about the jboss-cvs-commits
mailing list