February 2008 - seam-commits - Jboss List Archives

Seam SVN: r7390 - in trunk/examples/wiki: src/etc and 14 other directories.

by seam-commits＠lists.jboss.org

Author: christian.bauer(a)jboss.com Date: 2008-02-07 05:40:12 -0500 (Thu, 07 Feb 2008) New Revision: 7390 Removed: trunk/examples/wiki/src/etc/messages_en.properties trunk/examples/wiki/view/themes/inrelationto/mailtemplates/test.xhtml Modified: trunk/examples/wiki/README.txt trunk/examples/wiki/src/etc/i18n/messages_en.properties trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumHome.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/TopicHome.java trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml trunk/examples/wiki/view/includes/commentForm.xhtml trunk/examples/wiki/view/includes/wikiTextEditor.xhtml trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml trunk/examples/wiki/view/plugins/forumTopics/topicForm.xhtml trunk/examples/wiki/view/themes/default/css/template.css trunk/examples/wiki/view/themes/default/template.xhtml trunk/examples/wiki/view/themes/inrelationto/css/inrelationto.css trunk/examples/wiki/view/themes/inrelationto/template.xhtml trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css trunk/examples/wiki/view/themes/sfwkorg/template.xhtml Log: Formatting toolbar for wiki text editor Modified: trunk/examples/wiki/README.txt =================================================================== --- trunk/examples/wiki/README.txt 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/README.txt 2008-02-07 10:40:12 UTC (rev 7390) @@ -1,4 +1,4 @@ -This is not a regular "Seam example", its a standalone seam-gen project structure. The build.xml +This is not a regular "Seam example", its a standalone project structure. The build.xml references the existing Seam libraries and thirdparty libs, however, to avoid duplication. RUNNING THE UNIT TESTS @@ -30,7 +30,8 @@ - Call 'ant deploy' -- Start (if you haven't done so already) JBoss AS and access http://localhost:8080/wiki/ +- Start (if you haven't done so already) JBoss AS and access http://localhost:8080/wiki/ and use the + default login 'admin' with password 'admin' INSTALLATION WITH MYSQL (production profile) @@ -63,9 +64,6 @@ - Login as admin/admin and update the Lucene index in the 'Administration' screen -NOTE: The lucene index directory is named "lacewikiIndex" and located in the current directory. This -is the current directory from which you started the application server! If you want to change this setting, -unpack the WAR and change the META-INF/persistence.xml configuration file. - -WARNING: Do not use this software in production! The database schema is not final and will change! -No migration scripts for existing data will be provided until the software is production ready. +NOTE: The Lucene index directory for full-text searching is named "lacewikiIndex" and located in the +current directory. This is the current directory from which you started the application server! If you want +to change this setting, unpack the WAR and change the META-INF/persistence.xml configuration file. Modified: trunk/examples/wiki/src/etc/i18n/messages_en.properties =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_en.properties 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/src/etc/i18n/messages_en.properties 2008-02-07 10:40:12 UTC (rev 7390) @@ -218,7 +218,25 @@ # Wiki Text Editor lacewiki.label.wikiTextEditor.CharactersLeft=chars left -lacewiki.msg.wikiTextEditor.EditThisTextPreviewUpdatesAutomatically=Edit this text, the live preview updates if you stop typing for 3 seconds. +lacewiki.msg.wikiTextEditor.EditThisTextPreviewUpdatesAutomatically=Click HELP for text formatting instructions. Then edit this text, this live preview updates if you stop typing for 3 seconds. +lacewiki.msg.wikiTextEditor.FormatSelection=Format selected text... +lacewiki.msg.wikiTextEditor.FormatInline=-------- Inline -------- +lacewiki.msg.wikiTextEditor.FormatMonospace=Monospace/Code +lacewiki.msg.wikiTextEditor.FormatUnderline=Underline +lacewiki.msg.wikiTextEditor.FormatEmphasis=Emphasis +lacewiki.msg.wikiTextEditor.FormatStrikeout=Strikeout +lacewiki.msg.wikiTextEditor.FormatSuperscript=Superscript +lacewiki.msg.wikiTextEditor.FormatQuote=Quote +lacewiki.msg.wikiTextEditor.FormatLink=Link +lacewiki.msg.wikiTextEditor.FormatBlock=-------- Block --------- +lacewiki.msg.wikiTextEditor.FormatCodeBlock=Code Block +lacewiki.msg.wikiTextEditor.FormatQuoteBlock=Quote Block +lacewiki.msg.wikiTextEditor.FormatUnorderedList=Unordered List Item +lacewiki.msg.wikiTextEditor.FormatOrderedList=Ordered List Item +lacewiki.msg.wikiTextEditor.FormatHeadline1=Headline 1 +lacewiki.msg.wikiTextEditor.FormatHeadline2=Headline 2 +lacewiki.msg.wikiTextEditor.FormatHeadline3=Headline 3 +lacewiki.msg.wikiTextEditor.FormatHeadline4=Headline 4 # Document Display Deleted: trunk/examples/wiki/src/etc/messages_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_en.properties 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/src/etc/messages_en.properties 2008-02-07 10:40:12 UTC (rev 7390) @@ -1,694 +0,0 @@ -# TODO: Who uses these unicode arrows? -up=\u2191 -down=\u2193 -left=\u2039 -right=\u203A - -validator.assertFalse=Validation failed -validator.assertTrue=Validation failed -validator.future=Must be a future date -validator.length=Length must be between {min} and {max} -validator.max=Must be less than or equal to {value} -validator.min=Must be greater than or equal to {value} -validator.notNull=May not be null -validator.past=Must be a past date -validator.pattern=Must match "{regex}" -validator.range=Must be between {min} and {max} -validator.size=Size must be between {min} and {max} -validator.email=Must be a well-formed email address - -org.jboss.seam.loginFailed=Login failed, please try again. -org.jboss.seam.loginSuccessful=Login successful, welcome #0. - -org.jboss.seam.TransactionFailed=Transaction failed. -org.jboss.seam.NoConversation=The workspace ended, timed out or was processing another request. -org.jboss.seam.IllegalNavigation=Illegal navigation -org.jboss.seam.ProcessEnded=Process #0 already ended -org.jboss.seam.ProcessNotFound=Process #0 not found -org.jboss.seam.TaskEnded=Task #0 already ended -org.jboss.seam.TaskNotFound=Task #0 not found -org.jboss.seam.NotLoggedIn=Please log in first - -javax.faces.component.UIInput.CONVERSION=Value could not be converted to the expected type -javax.faces.component.UIInput.REQUIRED=A value is required -javax.faces.component.UIInput.UPDATE=An error occurred when processing your submitted information -javax.faces.component.UISelectOne.INVALID=Value is not valid -javax.faces.component.UISelectMany.INVALID=Value is not valid - -javax.faces.converter.BigDecimalConverter.DECIMAL=Value must be a number -javax.faces.converter.BigDecimalConverter.DECIMAL_detail=Value must be a signed decimal number consisting of zero or more digits, optionally followed by a decimal point and fraction, eg. {1} -javax.faces.converter.BigIntegerConverter.BIGINTEGER=Value must be a number -javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail=Value must be a signed integer number consisting of zero or more digits -javax.faces.converter.BooleanConverter.BOOLEAN=Value must be true or false -javax.faces.converter.BooleanConverter.BOOLEAN_detail=Value must be true or false (any value other than true will evaluate to false) -javax.faces.converter.ByteConverter.BYTE=Value must be a number between 0 and 255 -javax.faces.converter.ByteConverter.BYTE_detail=Value must be a number between 0 and 255 -javax.faces.converter.CharacterConverter.CHARACTER=Value must be a character -javax.faces.converter.CharacterConverter.CHARACTER_detail=Value must be a valid ASCII character -javax.faces.converter.DateTimeConverter.DATE=Value must be a date -javax.faces.converter.DateTimeConverter.DATE_detail=Value must be a date, eg. {1} -javax.faces.converter.DateTimeConverter.TIME=Value must be a time -javax.faces.converter.DateTimeConverter.TIME_detail=Value must be a time, eg. {1} -javax.faces.converter.DateTimeConverter.DATETIME=Value must be a date and time -javax.faces.converter.DateTimeConverter.DATETIME_detail=Value must be a date and time, eg. {1} -javax.faces.converter.DateTimeConverter.PATTERN_TYPE=A pattern or type attribute must be specified to convert the value -javax.faces.converter.DoubleConverter.DOUBLE=Value must be a number -javax.faces.converter.DoubleConverter.DOUBLE_detail=Value must be a number between 4.9E-324 and 1.7976931348623157E308 -javax.faces.converter.EnumConverter.ENUM=Value must be convertible to an enum -javax.faces.converter.EnumConverter.ENUM_detail=Value must be convertible to an enum or from the enum that contains the constant {1} -javax.faces.converter.EnumConverter.ENUM_NO_CLASS=Value must be convertible to an enum or from the enum, but no enum class provided -javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail=Value must be convertible to an enum or from the enum, but no enum class provided -javax.faces.converter.FloatConverter.FLOAT=Value must be a number -javax.faces.converter.FloatConverter.FLOAT_detail=Value must be a number between 1.4E-45 and 3.4028235E38 -javax.faces.converter.IntegerConverter.INTEGER=Value must be a number -javax.faces.converter.IntegerConverter.INTEGER_detail=Value must be a number between -2147483648 and 2147483647 -javax.faces.converter.LongConverter.LONG=Value must be a number -javax.faces.converter.LongConverter.LONG_detail=Must be a number between -9223372036854775808 and 9223372036854775807 -javax.faces.converter.NumberConverter.CURRENCY=Value must be a currency amount -javax.faces.converter.NumberConverter.CURRENCY_detail=Value must be a currency amount, eg. {1} -javax.faces.converter.NumberConverter.PERCENT=Value must be a percentage amount -javax.faces.converter.NumberConverter.PERCENT_detail=Value must be a percentage amount, eg. {1} -javax.faces.converter.NumberConverter.NUMBER=Value must be a number -javax.faces.converter.NumberConverter.NUMBER_detail=Value must be a number -javax.faces.converter.NumberConverter.PATTERN=Value must be a number -javax.faces.converter.NumberConverter.PATTERN_detail=Value must be a number -javax.faces.converter.ShortConverter.SHORT=Value must be a number -javax.faces.converter.ShortConverter.SHORT_detail=Value must be a number between -32768 and 32767 - -javax.faces.validator.DoubleRangeValidator.MAXIMUM=Value must be less than or equal to {0} -javax.faces.validator.DoubleRangeValidator.MINIMUM=Value must be greater than or equal to {0} -javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE=Value must be between {0} and {1} -javax.faces.validator.DoubleRangeValidator.TYPE=Value is not of the correct type -javax.faces.validator.LengthValidator.MAXIMUM=Value is must be shorter than or equal to {0} characters -javax.faces.validator.LengthValidator.MINIMUM=Value is must be longer than or equal to {0} characters -javax.faces.validator.LongRangeValidator.MAXIMUM=Value must be less than or equal to {0} -javax.faces.validator.LongRangeValidator.MINIMUM=Value must be greater than or equal to {0} -javax.faces.validator.LongRangeValidator.NOT_IN_RANGE=Value must be between {0} and {1} -javax.faces.validator.LongRangeValidator.TYPE=Value is not of the correct type - -javax.faces.validator.NOT_IN_RANGE=Value must be between {0} and {1} -javax.faces.converter.STRING=Value could not be converted to a string - -# Global - -lacewiki.label.Message=Message -lacewiki.label.OK=OK -lacewiki.label.Cancel=Cancel -lacewiki.label.Left=Left -lacewiki.label.Right=Right -lacewiki.label.Previous=Previous -lacewiki.label.Next=Next - -lacewiki.button.CreateDocument=Create -lacewiki.button.CreateDocument.accesskey=C -lacewiki.button.EditDocument=Edit -lacewiki.button.EditDocument.accesskey=E -lacewiki.button.HistoryDocument=History -lacewiki.button.HistoryDocument.accesskey=I -lacewiki.button.BrowseDirectory=Browse -lacewiki.button.BrowseDirectory.accesskey=B -lacewiki.button.CreateSubdirectory=Create Subdirectory -lacewiki.button.CreateSubdirectory.accesskey=S -lacewiki.button.EditDirectory=Edit Directory -lacewiki.button.EditDirectory.accesskey=E -lacewiki.button.NewDocument=New Document -lacewiki.button.NewDocument.accesskey=N -lacewiki.button.UploadFile=Upload File -lacewiki.button.UploadFile.accesskey=U -lacewiki.button.NewArea=New Area -lacewiki.button.NewArea.accesskey=N -lacewiki.button.EditWikiRoot=Edit Wiki Root -lacewiki.button.EditWikiRoot.accesskey=E -lacewiki.button.Edit=Edit -lacewiki.button.EmptyTrash=Empty Trash - -lacewiki.button.SwitchWorkspace=Switch Workspace -lacewiki.button.SwitchWorkspace.accesskey=W - -lacewiki.button.OK=Ok -lacewiki.button.OK.accesskey=O -lacewiki.button.Cancel=Cancel -lacewiki.button.Cancel.accesskey=C -lacewiki.button.CancelNoKey=Cancel - -lacewiki.button.Remove=Remove -lacewiki.button.Add=Add -lacewiki.button.Save=Save -lacewiki.button.Update=Update -lacewiki.button.Delete=Delete -lacewiki.button.Show=Show -lacewiki.button.Diff=Diff -lacewiki.button.Rollback=Rollback -lacewiki.button.PurgeHistory=Purge History -lacewiki.button.Find=Find -lacewiki.button.FirstPage=First Page -lacewiki.button.PreviousPage=Previous Page -lacewiki.button.NextPage=Next Page -lacewiki.button.LastPage=Last Page -lacewiki.button.Login=Login -lacewiki.button.Logout=Logout -lacewiki.button.Home=Home - -lacewiki.button.Close=Close Workspace -lacewiki.button.Close.accesskey=E -lacewiki.button.ExitEditor=Exit Workspace -lacewiki.button.ExitEditor.accesskey=E - -lacewiki.button.SiteFeed=Subscribe to site -lacewiki.button.DirectoryFeed=Subscribe to directory - -lacewiki.label.PermLink=PermLink -lacewiki.label.WikiLink=WikiLink -lacewiki.label.DirLink=Link to directory -lacewiki.label.Link=Link -lacewiki.label.ReadableBy=Readable by -lacewiki.label.WritableBy=Writable by -lacewiki.label.WriteProtected=Restrict edit access to admins -lacewiki.label.User=User -lacewiki.label.DeleteConfirmation=Delete Confirmation -lacewiki.label.AreYouSureYouWantToDelete=Are you sure you want to delete -lacewiki.label.DeleteAllChildren=? -lacewiki.label.Confirmation=Confirmation -lacewiki.label.AreYouSureYouWantToExecute=Are you sure you want to execute this operation? - -lacewiki.label.January=January -lacewiki.label.February=February -lacewiki.label.March=March -lacewiki.label.April=April -lacewiki.label.May=May -lacewiki.label.June=June -lacewiki.label.July=July -lacewiki.label.August=August -lacewiki.label.September=September -lacewiki.label.October=October -lacewiki.label.November=November -lacewiki.label.December=December - -# Help - -lacewiki.label.help.DialogTitle=Help -lacewiki.button.help.Help=Help -lacewiki.button.help.CloseHelp=Close Help - -# Search - -lacewiki.label.search.Search=Search -lacewiki.label.search.Results -lacewiki.label.search.All=All -lacewiki.label.search.In=In -lacewiki.label.search.Terms=Terms -lacewiki.label.search.ExactPhrase=Exact Phrase -lacewiki.label.search.Results=Results -lacewiki.button.search.Find=Find -lacewiki.button.search.Find.accesskey=F -lacewiki.label.search.Exclude=Exclude -lacewiki.label.search.AtAnyTime=at any time -lacewiki.label.search.Last7Days=last 7 days -lacewiki.label.search.Last30Days=last 30 days -lacewiki.label.search.Last6Months=last 6 months -lacewiki.label.search.To=to -lacewiki.label.search.Of=of -lacewiki.label.search.Hits=hit(s) -lacewiki.label.search.NoHits=No hits, please try again. - -# Verification - -lacewiki.label.VerificationQuestion=Enter characters (ignore circles) -lacewiki.label.VerificationError=The entered characters do not match the shown (case sensitive) characters, please try again. - -# Wiki Text Editor -lacewiki.label.wikiTextEditor.CharactersLeft=chars left -lacewiki.msg.wikiTextEditor.EditThisTextPreviewUpdatesAutomatically=Edit this text, the live preview updates if you stop typing for 3 seconds. - -# Document Display - -lacewiki.label.docDisplay.Tags=Tags -lacewiki.label.docDisplay.Created=Created -lacewiki.label.docDisplay.LastModified=Last Modified -lacewiki.label.docDisplay.Revisions=Revisions -lacewiki.label.docDisplay.Diff=Diff -lacewiki.label.docDisplay.InitialRevision=Initial Revision - -# Directory Display - -lacewiki.label.dirDisplay.Name=Name -lacewiki.label.dirDisplay.RightClickForActions=(right-click for menu) -lacewiki.label.dirDisplay.Owner=Owner -lacewiki.label.dirDisplay.ReadAccess=Read Access -lacewiki.label.dirDisplay.WriteAccess=Write Access -lacewiki.label.dirDisplay.LastModifiedOn=Last Modified On -lacewiki.label.dirDisplay.DirectoryIsEmpty=This directory is empty. -lacewiki.label.dirDisplay.PagerShowing= -lacewiki.label.dirDisplay.PagerTo=to -lacewiki.label.dirDisplay.PagerOf=of -lacewiki.label.dirDisplay.PagerElements= -lacewiki.label.dirDisplay.ShowItems=Show items -lacewiki.label.dirDisplay.All=All -lacewiki.button.dirDisplay.Refresh=Refresh -lacewiki.button.dirDisplay.Refresh.accesskey=F -lacewiki.button.dirDisplay.View=View -lacewiki.button.dirDisplay.ViewNewWindow=View (New Window) -lacewiki.button.dirDisplay.Edit=Edit -lacewiki.button.dirDisplay.Delete=Delete - - -# Tag Display - -lacewiki.label.tagDisplay.Tag=Tag -lacewiki.label.tagDisplay.InDirectory=In Directory -lacewiki.label.tagDisplay.Owner=Owner -lacewiki.label.tagDisplay.CreatedOn=Created On -lacewiki.label.tagDisplay.LastModifiedOn=Last Modified On -lacewiki.label.tagDisplay.NotAvailableForSkin=Tag display is not available with this skin. - -# Attachment Display - -lacewiki.label.attachmentDisplay.Attachments=Attachments - -# Comments - -lacewiki.label.commentsDisplay.Comment=comment -lacewiki.label.commentsDisplay.Comments=comments -lacewiki.label.commentsDisplay.CommentThread=the whole comment thread -lacewiki.button.commentsDisplay.RemoveComment=Remove -lacewiki.button.commentsDisplay.ReplyTo=Reply -lacewiki.button.commentsDisplay.Quote=Quote -lacewiki.button.commentForm.PostComment=Post Comment -lacewiki.button.commentForm.PostComment.accesskey=T -lacewiki.label.commentForm.PostComment=Post Comment -lacewiki.label.commentForm.Name=Name -lacewiki.label.commentForm.Email=E-mail address (optional) -lacewiki.label.commentForm.Homepage=Homepage URL (optional) -lacewiki.label.commentForm.Subject=Subject -lacewiki.label.commentForm.Comment=Comment -lacewiki.button.commentForm.Post=Post -lacewiki.label.comment.FeedEntryTitlePrefix=[Comment] -lacewiki.msg.comment.FeedIntro=This is a comment written in reply to -lacewiki.label.comment.RateThisPosting=Rate this posting -lacewiki.label.comment.Rating=Rating - -# User Control - -lacewiki.label.userControl.Username=Username -lacewiki.label.userControl.Password=Password -lacewiki.button.userControl.Login=Login -lacewiki.button.userControl.Login.accesskey=L -lacewiki.button.userControl.ResetPassword=Reset -lacewiki.button.userControl.Register=Register -lacewiki.button.userControl.Register.accesskey=R -lacewiki.button.userControl.Members=Members -lacewiki.button.userControl.Members.accesskey=M -lacewiki.button.userControl.Logout=Logout -lacewiki.button.userControl.Logout.accesskey=L -lacewiki.button.userControl.Home=Home -lacewiki.button.userControl.Home.accesskey=H -lacewiki.button.userControl.Profile=Profile -lacewiki.button.userControl.Profile.accesskey=P -lacewiki.button.userControl.Admin=Admin -lacewiki.button.userControl.Admin.accesskey=A - -# Password Reset -lacewiki.label.resetPassword.DialogTitle=Reset Password -lacewiki.label.resetPassword.Username=Your username -lacewiki.label.resetPassword.Email=Your e-mail address -lacewiki.button.resetPassword.Reset=Reset Password -lacewiki.label.resetPassword.ResetPasswordOf=Reset password of -lacewiki.label.resetPassword.Repeat=Repeat - - -lacewiki.msg.resetPassword.NotValid=Your account and e-mail address information didn't match, please try again to reset your password. -lacewiki.msg.resetPassword.EmailSent=A new activation code has been sent to your e-mail address, please read this e-mail to reset your password. -lacewiki.msg.resetPassword.PasswordResetPrepared=Please reset your password, enter your new password twice. -lacewiki.msg.resetPassword.Complete=Successfully reset password of account '{0}', please log in. - -# Search Control - -lacewiki.label.searchControl.Search=Search... -lacewiki.button.searchControl.Find=Find -lacewiki.button.searchControl.Find.accesskey=F - -# Administration - -lacewiki.label.adminHome.Administration=Administration -lacewiki.button.adminHome.SystemStatistics=System Statistics -lacewiki.button.adminHome.SystemStatistics.accesskey=Y -lacewiki.button.adminHome.RolesPermissions=Roles & Permissions -lacewiki.button.adminHome.RolesPermissions.accesskey=O -lacewiki.button.adminHome.LinkProtocols=Link Protocols -lacewiki.button.adminHome.LinkProtocols.accesskey=L -lacewiki.button.adminHome.Preferences=Preferences -lacewiki.button.adminHome.Preferences.accesskey=R -lacewiki.button.adminHome.SaveSettings=Save Settings -lacewiki.button.adminHome.SaveSettings.accesskey=S -lacewiki.label.adminHome.SearchIndex=Search Index -lacewiki.label.adminHome.NumOfIndexedDocuments=# of indexed documents -lacewiki.label.adminHome.NumOfIndexedTerms=# of indexed terms -lacewiki.label.adminHome.IndexSize=Index Size -lacewiki.button.adminHome.RebuildIndex=Rebuild Index -lacewiki.label.adminHome.Prefix=Prefix -lacewiki.label.adminHome.TargetLink=Target Link -lacewiki.label.adminHome.TargetWithPlaceHolder=Target with [[link]] placeholder -lacewiki.label.adminHome.NotAvailableForSkin=Administration is not available with this skin. - -# User Home - -lacewiki.label.userHome.MemberAccount=Member Account -lacewiki.label.userHome.EditUser=Edit User -lacewiki.button.userHome.Account=Account -lacewiki.button.userHome.Account.accesskey=N -lacewiki.button.userHome.Profile=Profile -lacewiki.button.userHome.Profile.accesskey=I -lacewiki.button.userHome.Preferences=Preferences -lacewiki.button.userHome.Preferences.accesskey=R -lacewiki.button.userHome.RemovePortrait=Remove Portrait -lacewiki.label.userHome.FirstName=First name -lacewiki.label.userHome.LastName=Last name -lacewiki.label.userHome.Email=E-Mail -lacewiki.label.userHome.Username=Username -lacewiki.label.userHome.Password=Password -lacewiki.label.userHome.RepeatPassword=Repeat password -lacewiki.label.userHome.AccountIsActive=Account is active -lacewiki.label.userHome.Roles=Roles -lacewiki.label.userHome.Portrait=Portrait -lacewiki.label.userHome.UploadPortrait=Upload Portrait -lacewiki.label.userHome.UploadMax=max -lacewiki.label.userHome.Bio=Bio -lacewiki.label.userHome.Website=Website -lacewiki.label.userHome.Location=Location -lacewiki.label.userHome.Occupation=Occupation -lacewiki.label.userHome.Signature=Signature -lacewiki.button.userHome.CreateHomeDirectory=Create Home Directory -lacewiki.button.userHome.CreateHomeDirectory=Create Home Directory -lacewiki.button.userHome.SaveSettings=Save Settings -lacewiki.button.userHome.SaveSettings.accesskey=S -lacewiki.button.userHome.Delete=Delete -lacewiki.button.userHome.Delete.accesskey=D -lacewiki.label.userHome.NotAvailableForSkin=User management is not available with this skin. -lacewiki.msg.userHome.PortraitRemoved=The portrait has been removed, save to make changes permanent. -lacewiki.msg.userHome.WrongPortraitImageType=The file type '{0}' is not supported, the portrait was not updated. - -# User Register - -lacewiki.label.userRegister.Registration=Registration -lacewiki.label.userRegister.RegisterNewAccount=Register new account -lacewiki.label.userRegister.CreateNewAccount=Create new account -lacewiki.label.userRegister.FirstName=First name -lacewiki.label.userRegister.LastName=Last name -lacewiki.label.userRegister.Email=E-Mail -lacewiki.label.userRegister.Username=Username -lacewiki.label.userRegister.Password=Password -lacewiki.label.userRegister.RepeatPassword=Repeat password -lacewiki.button.userRegister.Register=Register -lacewiki.button.userRegister.Register.accesskey=G -lacewiki.button.userRegister.Create=Create Account -lacewiki.button.userRegister.Create.accesskey=C -lacewiki.label.userRegister.NotAvailableForSkin=User registration is not available with this skin. - -# User List - -lacewiki.label.userList.MemberList=Member List -lacewiki.label.userList.Results=Results -lacewiki.button.userList.CreateAccount=Create Account -lacewiki.button.userList.CreateAccount.accesskey=C -lacewiki.label.userList.SearchMembers=Search Members -lacewiki.label.userList.Username=Username -lacewiki.label.userList.FirstName=First name -lacewiki.label.userList.LastName=Last name -lacewiki.label.userList.Email=E-Mail -lacewiki.label.userList.Show=Show -lacewiki.button.userList.Find=Find -lacewiki.button.userList.Find.accesskey=I -lacewiki.label.userList.Found=Found -lacewiki.label.userList.Members=member(s) -lacewiki.label.userList.JoinedOn=Joined -lacewiki.label.userList.LastLoginOn=Last Login -lacewiki.label.userList.NotActivated=Not Activated -lacewiki.button.userList.Edit=Edit -lacewiki.label.userList.NotAvailableForSkin=User search is not available with this skin. - -# User Info - -lacewiki.label.userInfo.UserInfo=User Summary -lacewiki.label.userInfo.NotActivated=Not Activated -lacewiki.label.userInfo.NoProfile=No profile available. -lacewiki.label.userInfo.Name=Name -lacewiki.label.userInfo.JoinedOn=Joined -lacewiki.label.userInfo.LastLoginOn=Last Login -lacewiki.label.userInfo.RatingPoints=Rating Points -lacewiki.button.userInfo.EditAccount=Edit Account -lacewiki.button.userInfo.EditAccount.accesskey=E - -# Document History - -lacewiki.label.docHistory.DocumentHistory=Document History -lacewiki.label.docHistory.CurrentRevision=Current revision -lacewiki.label.docHistory.Parent=Parent -lacewiki.label.docHistory.CreatedOn=Created On -lacewiki.label.docHistory.LastModifiedOn=Last Modified On -lacewiki.label.docHistory.HistoricalRevisions=Historical revisions -lacewiki.button.docHistory.Show=Show -lacewiki.button.docHistory.Diff=Diff -lacewiki.button.docHistory.Rollback=Rollback -lacewiki.button.docHistory.PurgeHistory=Purge History -lacewiki.button.docHistory.PurgeHistory.accesskey=U -lacewiki.msg.docHistory.PurgedHistory=Historical revisions have been cleared. - -# Uploader - -lacewiki.msg.upload.HandlersDontMatch=Wrong file type uploaded, please try again with a different file. -lacewiki.msg.upload.NoData=Please select a file to upload. -lacewiki.label.upload.UploadFile=Upload File -lacewiki.label.upload.Upload=Upload -lacewiki.label.upload.UploadMax=max. -lacewiki.button.upload.Upload=Upload -lacewiki.button.upload.Upload.accesskey=U -lacewiki.button.upload.UploadOverwrite=Upload - -# Upload Edit - -lacewiki.label.uploadEdit.UploadFile=Upload File -lacewiki.label.uploadEdit.EditFile=Edit File -lacewiki.label.uploadEdit.Directory=Directory -lacewiki.label.uploadEdit.CreatedOn=Created on -lacewiki.label.uploadEdit.Name=Name -lacewiki.label.uploadEdit.FileDetails=File Details -lacewiki.label.uploadEdit.Converters=Converters -lacewiki.label.uploadEdit.OriginalImageSize=Original Image Size -lacewiki.label.uploadEdit.Pixel=px -lacewiki.label.uploadEdit.ImagePreview=Image Preview -lacewiki.label.uploadEdit.ShowInDocuments=Show in documents -lacewiki.label.uploadEdit.SmallThumbnail=Small thumbnail -lacewiki.label.uploadEdit.MediumThumbnail=Medium thumbnail -lacewiki.label.uploadEdit.LargeThumbnail=Large thumbnail -lacewiki.label.uploadEdit.FullSize=Full size -lacewiki.label.uploadEdit.AsAttachment=As attachment -lacewiki.label.uploadEdit.Upload=Upload -lacewiki.label.uploadEdit.UploadMax=max. -lacewiki.button.uploadEdit.ZoomOut=Zoom Out -lacewiki.button.uploadEdit.ZoomIn=Zoom In -lacewiki.button.uploadEdit.ActualSize=Actual Size -lacewiki.button.uploadEdit.Save=Save -lacewiki.button.uploadEdit.Save.accesskey=S -lacewiki.button.uploadEdit.Update=Update -lacewiki.button.uploadEdit.Update.accesskey=U -lacewiki.button.uploadEdit.Delete=Delete -lacewiki.button.uploadEdit.Delete.accesskey=D -lacewiki.msg.uploadEdit.UpdateUpload=File {0} has been uploaded. - -# Document Edit - -lacewiki.label.docEdit.CreateDocument=Create Document -lacewiki.label.docEdit.EditDocument=Edit Document -lacewiki.button.docEdit.Content=Content -lacewiki.button.docEdit.Content.accesskey=C -lacewiki.button.docEdit.Properties=Properties -lacewiki.button.docEdit.Properties.accesskey=T -lacewiki.button.docEdit.AdminOptions=Admin Options -lacewiki.button.docEdit.AdminOptions.accesskey=O -lacewiki.label.docEdit.Directory=Directory -lacewiki.label.docEdit.Name=Name -lacewiki.label.docEdit.RenderNameAsTitle=Render name as document title -lacewiki.label.docEdit.MinorChange=Minor change, don't create a new revision -lacewiki.label.docEdit.CreateOnParentFeeds=Create entry on parent directory feeds -lacewiki.label.docEdit.CreateOnSiteFeed=Create entry on global site feed -lacewiki.label.docEdit.PushOnFeeds=Push changes onto feeds -lacewiki.label.docEdit.PushOnParentFeeds=Push changes onto feeds of parent directories -lacewiki.label.docEdit.Content=Content -lacewiki.label.docEdit.EnableLivePreview=Enable live preview -lacewiki.label.docEdit.ShowPluginSettings=Show plugin settings in preview -lacewiki.label.docEdit.CreatedOn=Created on -lacewiki.label.docEdit.Options=Options -lacewiki.label.docEdit.EnableComments=Enable comments -lacewiki.label.docEdit.AllowCommentPosting=Allow posting of new comments -lacewiki.label.docEdit.PushCommentsOnFeeds=Push comments onto feeds of parent directories (except site feed) -lacewiki.label.docEdit.Header=Header -lacewiki.label.docEdit.Footer=Footer -lacewiki.button.docEdit.Save=Save -lacewiki.button.docEdit.Save.accesskey=S -lacewiki.button.docEdit.Update=Update -lacewiki.button.docEdit.Update.accesskey=U -lacewiki.button.docEdit.Delete=Delete -lacewiki.button.docEdit.Delete.accesskey=D - -# Directory Edit - -lacewiki.label.dirEdit.CreateDirectory=Create Directory -lacewiki.label.dirEdit.EditDirectory=Edit Directory -lacewiki.label.dirEdit.Parent=Parent -lacewiki.label.dirEdit.CreatedOn=Created on -lacewiki.label.dirEdit.Name=Name -lacewiki.label.dirEdit.Description=Description -lacewiki.label.dirEdit.DefaultDocument=Default Document -lacewiki.label.dirEdit.NoDefaultDocument=No Default Document -lacewiki.label.dirEdit.MenuItems=Menu items -lacewiki.label.dirEdit.Options=Options -lacewiki.label.dirEdit.EnableFeed=Enable syndication feed -lacewiki.button.dirEdit.ResetFeed=Clear Feed -lacewiki.button.dirEdit.Save=Save -lacewiki.button.dirEdit.Save.accesskey=S -lacewiki.button.dirEdit.Update=Update -lacewiki.button.dirEdit.Update.accesskey=U -lacewiki.button.dirEdit.Delete=Delete -lacewiki.button.dirEdit.Delete.accesskey=D - -# Tag Editor - -lacewiki.label.tagEdit.Tags=Tags -lacewiki.label.tagEdit.PopularTags=Popular tags - -# Owner Selector - -lacewiki.label.ownerSelector.SelectOwner=Select Owner... -lacewiki.button.ownerSelector.Select=Select - -# Clipboard - -lacewiki.label.Clipboard=Clipboard -lacewiki.label.Clipboard.Select=Select -lacewiki.label.Clipboard.All=All -lacewiki.label.Clipboard.None=None -lacewiki.label.Clipboard.Documents=Documents -lacewiki.label.Clipboard.UploadedFiles=Uploaded Files -lacewiki.label.Clipboard.Item=item -lacewiki.label.Clipboard.Items=items -lacewiki.label.Clipboard.Empty=Empty -lacewiki.label.Clipboard.CopySuffix=Copy -lacewiki.button.Clipboard.Copy=Copy -lacewiki.button.Clipboard.Copy.accesskey=C -lacewiki.button.Clipboard.Cut=Cut -lacewiki.button.Clipboard.Cut.accesskey=U -lacewiki.button.Clipboard.Clear=Clear -lacewiki.button.Clipboard.Clear.accesskey=L -lacewiki.button.Clipboard.Paste=Paste -lacewiki.button.Clipboard.Paste.accesskey=P -lacewiki.msg.Clipboard.DuplicatePasteName=The name '{0}' was already in use in this area, renamed item to '{1}'. -lacewiki.msg.Clipboard.DuplicatePasteNameFailure=The name '{0}' was already in use in this area and is too long to be renamed, skipping paste. - - -# Entity update/delete/persist - -lacewiki.msg.Directory.Persist=Directory '{0}' has been saved. -lacewiki.msg.Directory.Update=Directory '{0}' has been updated. -lacewiki.msg.Directory.Delete=Directory '{0}' has been deleted. -lacewiki.msg.Document.Persist=Document '{0}' has been saved. -lacewiki.msg.Document.Update=Document '{0}' has been updated. -lacewiki.msg.Document.Delete=Document '{0}' has been deleted. -lacewiki.msg.Upload.Persist=File '{0}' has been saved. -lacewiki.msg.Upload.Update=File '{0}' has been updated. -lacewiki.msg.Upload.Delete=File '{0}' has been deleted. -lacewiki.msg.User.Persist=User account '{0}' has been saved. -lacewiki.msg.User.Update=User account '{0}' has been updated. -lacewiki.msg.User.Delete=User account '{0}' has been deleted. -lacewiki.msg.Feed.Create=Created syndication feed for this directory. -lacewiki.msg.Feed.Remove=Removed syndication feed of this directory. -lacewiki.msg.Feed.Reset=Queued removal of all feed entries from the syndication feed of this directory, please update to finalize. -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 - -lacewiki.entity.DuplicateName=This name/subject/title is already used, please change it. -lacewiki.entity.NameMustStartWithLetterOrNumber=Name must start with a letter or number and not contain [, ], |, / or #. -lacewiki.entity.NameMustStartWithUppercaseLetterOrNumber=Name must start with an uppercase letter or number. -lacewiki.entity.NameMustNotContainSpecialCharacters=Name can not contain special characters. -lacewiki.entity.UsernameMustStartWithALetterAndOnlyContainLetters=Username must start with a letter, and only contain letters and numbers. -lacewiki.entity.LinkProtokol.PrefixMustOnlyContainLetters=Prefix must only contain letters. - -# Misc messages - -lacewiki.msg.SessionTimeout=Your session has timed out, you will be redirected to the start page. -lacewiki.msg.UsernameExists=A user with that username already exists, please pick a different name. -lacewiki.msg.PasswordControlNoMatch=The passwords don't match, please enter again. -lacewiki.msg.PasswordDoesntMatchPattern=Password does not match the pattern {0}, please enter again. -lacewiki.msg.PasswordOrPasswordControlEmpty=Please enter your password twice! -lacewiki.msg.HomeDirectoryCreated=New home directory has been queued, save settings to commit. -lacewiki.msg.AccountCreatedConfirmationSent=Account activation e-mail was sent to your address, please read it to activate your account. -lacewiki.msg.AccountActivatedPleaseLogin=Your account has been activated, please login. -lacewiki.msg.InvalidActivationCode=The activation code is invalid. -lacewiki.msg.UpdatedCurrentCredentials=You modified your username and/or password, please login again. -lacewiki.msg.SystemSettingsUpdated=System settings updated. -lacewiki.msg.DiffOldVersionDisplayed=Showing historical revision {0}. -lacewiki.msg.HistoricalNodeNotFound=Couldn't find historical node: {0}. -lacewiki.msg.DiffCreated=Comparing current revision with historical revision {0}. -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} -lacewiki.msg.ImportOk=Created file '{0}' in current directory. -lacewiki.msg.OptimisticLockError=Someone modified the same record while you were editing it. Your workspace has been closed. -lacewiki.msg.AccessDenied=Access Denied -lacewiki.msg.FatalError=An unrecoverable error occured, please check the application log or contact the administrator! -lacewiki.msg.Trash.Emptied=All items in the trash have been permanently deleted. -lacewiki.msg.AutomaticallyGeneratedFeed=Aggregated Feed - -# Preferences Editors -lacewiki.preferences.editor.SelectNone=(None) - - -# Core Preferences - -lacewiki.preferences.wiki.Name=Core: Wiki -lacewiki.preferences.wiki.BaseURL=Static URL (in e-mails etc.) without trailing slash (e.g. 'http://my.wiki.server/installdir') -lacewiki.preferences.wiki.TimeZone=Timezone of server (ID as defined in java.util.TimeZone -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 -lacewiki.preferences.wiki.FeedTitlePrefix=Feed title prefix -lacewiki.preferences.wiki.PurgeFeedEntriesAfterDays=Feed entries are purged after days -lacewiki.preferences.wiki.AtSymbolReplacement=Replace @ symbol in e-mail addresses with -lacewiki.preferences.wiki.ShowEmailToLoggedInOnly=Show e-mail addresses only to logged-in users -lacewiki.preferences.wiki.MainMenuLevels=Main menu is flattened to levels (0 for unlimited visible levels) -lacewiki.preferences.wiki.MainMenuDepth=Main menu maximum depth of directories -lacewiki.preferences.wiki.MainMenuShowAdminOnly=Main menu includes only directories owned by system administrator -lacewiki.preferences.wiki.ShowDocumentCreatorHistory=Show document creator/edit history in document footer -lacewiki.preferences.wiki.ShowTags=Show document tags in document footer -lacewiki.preferences.wiki.ShowSiteFeedInMenu=Show global site feed in main menu - -lacewiki.preferences.userManagement.Name=Core: User Management -lacewiki.preferences.userManagement.ActivationCodeSalt=Secret salt used to generate activation codes -lacewiki.preferences.userManagement.PasswordRegex=Regex used for password strength verification -lacewiki.preferences.userManagement.NewUserInRole=Default role of new user -lacewiki.preferences.userManagement.EnableRegistration=Enable public user registration -lacewiki.preferences.userManagement.CreateHomeAfterUserActivation=Create home directory for new user after activation -lacewiki.preferences.userManagement.HomepageDefaultContent=Content of created home page - -lacewiki.preferences.documentEditor.Name=Core: Document Editor -lacewiki.preferences.documentEditor.MinorRevisionEnabled=Enable 'Minor Revision' checkbox by default -lacewiki.preferences.documentEditor.RegularEditAreaRows=Rows shown in text editor by default -lacewiki.preferences.documentEditor.RegularEditAreaColumns=Columns shown in text editor by default - -lacewiki.preferences.comments.Name=Core: Comments -lacewiki.preferences.comments.ListAscending=List flat comments ascending by date (or descending) -lacewiki.preferences.comments.EnableByDefault=Enable comments by default for new documents -lacewiki.preferences.comments.Threaded=Threaded comment display (or flat) - Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java 2008-02-07 10:40:12 UTC (rev 7390) @@ -36,19 +36,6 @@ private User currentUser; private Integer currentAccessLevel; - // TODO: Override Shanes last commit, which introduced a bug, raising an "already logged in" message - public String login() { - try { - authenticate(); - if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGIN_SUCCESSFUL); - return "loggedIn"; - } - catch (LoginException ex) { - if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGIN_FAILED, ex); - return null; - } - } - // We don't care if a user is logged in, just check it... public void checkRestriction(String expr) { if (!evaluateExpression(expr)) { Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumHome.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumHome.java 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumHome.java 2008-02-07 10:40:12 UTC (rev 7390) @@ -175,6 +175,10 @@ "Removed syndication feed of this forum"); } + protected String getEditorWorkspaceDescription(boolean create) { + return null; + } + /* -------------------------- Internal Methods ------------------------------ */ private void endConversation() { Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/TopicHome.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/TopicHome.java 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/TopicHome.java 2008-02-07 10:40:12 UTC (rev 7390) @@ -156,6 +156,10 @@ ); } + protected String getEditorWorkspaceDescription(boolean create) { + return null; + } + /* -------------------------- Internal Methods ------------------------------ */ private void endConversation() { Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml =================================================================== --- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-02-07 10:40:12 UTC (rev 7390) @@ -25,7 +25,7 @@ <PREFERENCE PREF_ID = "50" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "minorRevisionEnabled" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/> <PREFERENCE PREF_ID = "51" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "regularEditAreaRows" STRING_VALUE = "[NULL]" LONG_VALUE = "15" BOOLEAN_VALUE = "[NULL]"/> - <PREFERENCE PREF_ID = "52" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "regularEditAreaColumns" STRING_VALUE = "[NULL]" LONG_VALUE = "60" BOOLEAN_VALUE = "[NULL]"/> + <PREFERENCE PREF_ID = "52" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "regularEditAreaColumns" STRING_VALUE = "[NULL]" LONG_VALUE = "65" BOOLEAN_VALUE = "[NULL]"/> <PREFERENCE PREF_ID = "60" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "activationCodeSalt" STRING_VALUE = "MySecretSalt123" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> <PREFERENCE PREF_ID = "61" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "UserManagement" PROPERTY_NAME = "passwordRegex" STRING_VALUE = "^[0-9A-Za-z]{6,15}" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> Modified: trunk/examples/wiki/view/includes/commentForm.xhtml =================================================================== --- trunk/examples/wiki/view/includes/commentForm.xhtml 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/view/includes/commentForm.xhtml 2008-02-07 10:40:12 UTC (rev 7390) @@ -84,26 +84,28 @@ </s:decorate> </a:region> - <ui:include src="wikiTextEditor.xhtml"> - <ui:param name="textEditorId" value="comment"/> - <ui:param name="textPreviewId" value="commentPreview"/> - <ui:param name="namingContainer" value="commentForm"/> - <ui:param name="statusId" value="commentFormStatus"/> - <ui:param name="label" value="#{messages['lacewiki.label.commentForm.Comment']}"/> - <ui:param name="valueBinding" value="#{commentHome.instance.content}"/> - <ui:param name="valueMaxLength" value="32768"/> - <ui:param name="valueRequired" value="true"/> - <ui:param name="textEditorColumns" value="#{commentHome.instance.ownedByRegularUser ? '60' : '48'}"/> - <ui:param name="textEditorRows" value="10"/> - </ui:include> + <a:region> + <ui:include src="wikiTextEditor.xhtml"> + <ui:param name="textEditorId" value="comment"/> + <ui:param name="textPreviewId" value="commentPreview"/> + <ui:param name="namingContainer" value="commentForm"/> + <ui:param name="statusId" value="commentFormStatus"/> + <ui:param name="label" value="#{messages['lacewiki.label.commentForm.Comment']}"/> + <ui:param name="valueBinding" value="#{commentHome.instance.content}"/> + <ui:param name="valueMaxLength" value="32768"/> + <ui:param name="valueRequired" value="true"/> + <ui:param name="textEditorColumns" value="#{commentHome.instance.ownedByRegularUser ? '60' : '48'}"/> + <ui:param name="textEditorRows" value="10"/> + </ui:include> - <ui:include src="wikiTextPreview.xhtml"> - <ui:param name="textPreviewId" value="commentPreview"/> - <ui:param name="valueBinding" value="#{commentHome.instance.content}"/> - <ui:param name="enablePlugins" value="false"/> - <ui:param name="baseDocument" value="#{currentDocument}"/> - <ui:param name="baseDirectory" value="#{currentDocument.parent}"/> - </ui:include> + <ui:include src="wikiTextPreview.xhtml"> + <ui:param name="textPreviewId" value="commentPreview"/> + <ui:param name="valueBinding" value="#{commentHome.instance.content}"/> + <ui:param name="enablePlugins" value="false"/> + <ui:param name="baseDocument" value="#{currentDocument}"/> + <ui:param name="baseDirectory" value="#{currentDocument.parent}"/> + </ui:include> + </a:region> <s:decorate id="verifyCaptchaEntry" template="captchaEntry.xhtml"> <ui:param name="statusId" value="commentFormStatus"/> Modified: trunk/examples/wiki/view/includes/wikiTextEditor.xhtml =================================================================== --- trunk/examples/wiki/view/includes/wikiTextEditor.xhtml 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/view/includes/wikiTextEditor.xhtml 2008-02-07 10:40:12 UTC (rev 7390) @@ -90,9 +90,52 @@ <s:div id="#{textEditorId}TextEditDiv" styleClass="textEditResizable"> - <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0" - columnClasses="textArea, textAreaHelp"> + <h:panelGrid columns="1" cellpadding="0" cellspacing="0" border="0"> + <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> + + <s:fragment> + <select id="#{textEditorId}Formatter" + onchange="formatText( + jQuery('##{namingContainer}\\:#{textEditorId}TextArea')[0], + jQuery('##{textEditorId}Formatter')[0].options[jQuery('##{textEditorId}Formatter')[0].selectedIndex].value + ); + #{textEditorId}RefreshPreview(); + jQuery('##{textEditorId}Formatter')[0].options[0].selected = true;"> + <option value="">#{messages['lacewiki.msg.wikiTextEditor.FormatSelection']}</option> + <option value="">#{messages['lacewiki.msg.wikiTextEditor.FormatInline']}</option> + <option value="|{i}|">#{messages['lacewiki.msg.wikiTextEditor.FormatMonospace']}</option> + <option value="*{i}*">#{messages['lacewiki.msg.wikiTextEditor.FormatEmphasis']}</option> + <option value="_{i}_">#{messages['lacewiki.msg.wikiTextEditor.FormatUnderline']}</option> + <option value="~{i}~">#{messages['lacewiki.msg.wikiTextEditor.FormatStrikeout']}</option> + <option value="^{i}^">#{messages['lacewiki.msg.wikiTextEditor.FormatSuperscript']}</option> + <option value=""{i}"">#{messages['lacewiki.msg.wikiTextEditor.FormatQuote']}</option> + <option value="[My Link=>{i}]">#{messages['lacewiki.msg.wikiTextEditor.FormatLink']}</option> + <option value="">#{messages['lacewiki.msg.wikiTextEditor.FormatBlock']}</option> + <option value="`{b}`">#{messages['lacewiki.msg.wikiTextEditor.FormatCodeBlock']}</option> + <option value=""{b}"">#{messages['lacewiki.msg.wikiTextEditor.FormatQuoteBlock']}</option> + <option value="= {b}">#{messages['lacewiki.msg.wikiTextEditor.FormatUnorderedList']}</option> + <option value="# {b}">#{messages['lacewiki.msg.wikiTextEditor.FormatOrderedList']}</option> + <option value="+ {b}">#{messages['lacewiki.msg.wikiTextEditor.FormatHeadline1']}</option> + <option value="++ {b}">#{messages['lacewiki.msg.wikiTextEditor.FormatHeadline2']}</option> + <option value="+++ {b}">#{messages['lacewiki.msg.wikiTextEditor.FormatHeadline3']}</option> + <option value="++++ {b}">#{messages['lacewiki.msg.wikiTextEditor.FormatHeadline4']}</option> + </select> + + <a:jsFunction name="#{textEditorId}RefreshPreview" status="#{statusId}" + reRender="#{textEditorId}MessageLabel, #{textPreviewId}"/> + </s:fragment> + + <ui:decorate template="helpPopupButton.xhtml"> + <ui:param name="label" value="#{messages['lacewiki.button.help.Help']}"/> + <ui:param name="width" value="450"/> + <ui:param name="height" value="350"/> + <ui:param name="offsetId" value="#{namingContainer}\\\\:#{textEditorId}TextEditDiv"/> + <ui:param name="helpDocument" value="Wiki Text Markup"/> + </ui:decorate> + + </h:panelGrid> + <h:inputTextarea id="#{textEditorId}TextArea" styleClass="ajaxSupport" tabindex="1" @@ -114,14 +157,6 @@ rendered="#{not empty textPreviewId}"/> </h:inputTextarea> - <ui:decorate template="helpPopupButton.xhtml"> - <ui:param name="label" value="#{messages['lacewiki.button.help.Help']}"/> - <ui:param name="width" value="450"/> - <ui:param name="height" value="350"/> - <ui:param name="offsetId" value="#{namingContainer}\\\\:#{textEditorId}TextEditDiv"/> - <ui:param name="helpDocument" value="Wiki Text Markup"/> - </ui:decorate> - </h:panelGrid> <s:div id="#{textEditorId}TextEditResizeHandle" styleClass="textEditResizeHandle" style="display:none;"/> Modified: trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/view/plugins/forumReplies/replyForm.xhtml 2008-02-07 10:40:12 UTC (rev 7390) @@ -77,27 +77,28 @@ </h:inputText> </s:decorate> -  - <ui:include src="../../includes/wikiTextEditor.xhtml"> - <ui:param name="textEditorId" value="reply"/> - <ui:param name="textPreviewId" value="replyPreview"/> - <ui:param name="namingContainer" value="forumRepliesPlugin\\\\:replyForm"/> - <ui:param name="statusId" value="replyFormStatus"/> - <ui:param name="label" value="#{messages['forum.label.replyForm.Message']}"/> - <ui:param name="valueBinding" value="#{replyHome.instance.content}"/> - <ui:param name="valueMaxLength" value="32768"/> - <ui:param name="valueRequired" value="true"/> - <ui:param name="textEditorColumns" value="#{replyHome.instance.ownedByRegularUser ? '60' : '48'}"/> - <ui:param name="textEditorRows" value="20"/> - </ui:include> + <a:region> + <ui:include src="../../includes/wikiTextEditor.xhtml"> + <ui:param name="textEditorId" value="reply"/> + <ui:param name="textPreviewId" value="replyPreview"/> + <ui:param name="namingContainer" value="forumRepliesPlugin\\\\:replyForm"/> + <ui:param name="statusId" value="replyFormStatus"/> + <ui:param name="label" value="#{messages['forum.label.replyForm.Message']}"/> + <ui:param name="valueBinding" value="#{replyHome.instance.content}"/> + <ui:param name="valueMaxLength" value="32768"/> + <ui:param name="valueRequired" value="true"/> + <ui:param name="textEditorColumns" value="#{replyHome.instance.ownedByRegularUser ? '65' : '55'}"/> + <ui:param name="textEditorRows" value="20"/> + </ui:include> - <ui:include src="../../includes/wikiTextPreview.xhtml"> - <ui:param name="textPreviewId" value="replyPreview"/> - <ui:param name="valueBinding" value="#{replyHome.instance.content}"/> - <ui:param name="enablePlugins" value="false"/> - <ui:param name="baseDocument" value="#{currentDocument}"/> - <ui:param name="baseDirectory" value="#{currentDocument.parent}"/> - </ui:include> + <ui:include src="../../includes/wikiTextPreview.xhtml"> + <ui:param name="textPreviewId" value="replyPreview"/> + <ui:param name="valueBinding" value="#{replyHome.instance.content}"/> + <ui:param name="enablePlugins" value="false"/> + <ui:param name="baseDocument" value="#{currentDocument}"/> + <ui:param name="baseDirectory" value="#{currentDocument.parent}"/> + </ui:include> + </a:region> <s:decorate id="verifyCaptchaEntry" template="../../includes/captchaEntry.xhtml"> <ui:param name="statusId" value="replyFormStatus"/> Modified: trunk/examples/wiki/view/plugins/forumTopics/topicForm.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumTopics/topicForm.xhtml 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/view/plugins/forumTopics/topicForm.xhtml 2008-02-07 10:40:12 UTC (rev 7390) @@ -31,29 +31,31 @@ <h:inputText id="topicName" tabindex="1" size="60" maxlength="255" required="true" value="#{topicHome.instance.name}"/> </s:decorate> - <ui:include src="../../includes/wikiTextEditor.xhtml"> - <ui:param name="textEditorId" value="topic"/> - <ui:param name="textPreviewId" value="topicPreview"/> - <ui:param name="namingContainer" value="forumTopicsPlugin\\\\:topicForm"/> - <ui:param name="statusId" value="topicFormStatus"/> - <ui:param name="label" value="#{messages['forum.label.Message']}"/> - <ui:param name="valueBinding" value="#{topicHome.formContent}"/> - <ui:param name="valueMaxLength" value="32768"/> - <ui:param name="valueRequired" value="true"/> - <ui:param name="textEditorColumns" value="60"/> - <ui:param name="textEditorRows" value="20"/> - </ui:include> - - <s:div styleClass="marginLeft"> - <ui:include src="../../includes/wikiTextPreview.xhtml"> + <a:region> + <ui:include src="../../includes/wikiTextEditor.xhtml"> + <ui:param name="textEditorId" value="topic"/> <ui:param name="textPreviewId" value="topicPreview"/> - <ui:param name="valueBinding" value="#{topicHome.instance.content}"/> - <ui:param name="enablePlugins" value="false"/> - <ui:param name="baseDocument" value="#{topicHome.instance}"/> - <ui:param name="baseDirectory" value="#{currentDirectory}"/> + <ui:param name="namingContainer" value="forumTopicsPlugin\\\\:topicForm"/> + <ui:param name="statusId" value="topicFormStatus"/> + <ui:param name="label" value="#{messages['forum.label.Message']}"/> + <ui:param name="valueBinding" value="#{topicHome.formContent}"/> + <ui:param name="valueMaxLength" value="32768"/> + <ui:param name="valueRequired" value="true"/> + <ui:param name="textEditorColumns" value="60"/> + <ui:param name="textEditorRows" value="20"/> </ui:include> - </s:div> + <s:div styleClass="marginLeft"> + <ui:include src="../../includes/wikiTextPreview.xhtml"> + <ui:param name="textPreviewId" value="topicPreview"/> + <ui:param name="valueBinding" value="#{topicHome.instance.content}"/> + <ui:param name="enablePlugins" value="false"/> + <ui:param name="baseDocument" value="#{topicHome.instance}"/> + <ui:param name="baseDirectory" value="#{currentDirectory}"/> + </ui:include> + </s:div> + </a:region> + <s:fragment rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"> <s:div styleClass="entry"> <div class="label"> Modified: trunk/examples/wiki/view/themes/default/css/template.css =================================================================== --- trunk/examples/wiki/view/themes/default/css/template.css 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/view/themes/default/css/template.css 2008-02-07 10:40:12 UTC (rev 7390) @@ -659,11 +659,6 @@ margin-left: 240px; } -.textAreaHelp { - padding-top: 5px; - vertical-align: top; -} - .textPreview { border: 1px dashed #666; margin-bottom: 10px; Modified: trunk/examples/wiki/view/themes/default/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/default/template.xhtml 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/view/themes/default/template.xhtml 2008-02-07 10:40:12 UTC (rev 7390) @@ -117,6 +117,44 @@ return s.substring(s.length - suffix.length) == suffix; } + function formatText(textArea, formatString) { + var inlinePlaceholder = "{i}"; + var blockPlaceholder = "{b}"; + var inline = formatString.indexOf(inlinePlaceholder) != -1; + var block = formatString.indexOf(blockPlaceholder) != -1; + if (!(inline || block)) return; + var prefix = formatString.substring(0, formatString.indexOf(inline ? inlinePlaceholder : blockPlaceholder)); + var suffix = formatString.substring(formatString.indexOf(inline ? inlinePlaceholder : blockPlaceholder)+3, formatString.length); + if (block) { + prefix = "\n" + prefix; + suffix = suffix + "\n"; + } + + if (typeof(textArea.caretPos) != "undefined" && textArea.createTextRange) { + var caretPos = textArea.caretPos; + caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? prefix + caretPos.text + suffix + ' ' : prefix + caretPos.text + suffix; + caretPos.select(); + } else if (typeof(textArea.selectionStart) != "undefined") { + var begin = textArea.value.substr(0, textArea.selectionStart); + var selection = textArea.value.substr(textArea.selectionStart, textArea.selectionEnd - textArea.selectionStart); + var end = textArea.value.substr(textArea.selectionEnd); + var newCursorPos = textArea.selectionStart; + var scrollPos = textArea.scrollTop; + textArea.value = begin + prefix + selection + suffix + end; + if (textArea.setSelectionRange) { + if (selection.length == 0) + textArea.setSelectionRange(newCursorPos + prefix.length, newCursorPos + prefix.length); + else + textArea.setSelectionRange(newCursorPos, newCursorPos + prefix.length + selection.length + suffix.length); + textArea.focus(); + } + textArea.scrollTop = scrollPos; + } else { + textArea.value += prefix + suffix; + textArea.focus(textArea.value.length - 1); + } + } + // ###################### Popups ################################# function deleteConfirmation(message, deleteFunction) { Modified: trunk/examples/wiki/view/themes/inrelationto/css/inrelationto.css =================================================================== --- trunk/examples/wiki/view/themes/inrelationto/css/inrelationto.css 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/view/themes/inrelationto/css/inrelationto.css 2008-02-07 10:40:12 UTC (rev 7390) @@ -668,11 +668,6 @@ margin-left: 240px; } -.textAreaHelp { - padding-top: 5px; - vertical-align: top; -} - .textPreview { border: 1px dashed #666; margin-bottom: 10px; Deleted: trunk/examples/wiki/view/themes/inrelationto/mailtemplates/test.xhtml =================================================================== --- trunk/examples/wiki/view/themes/inrelationto/mailtemplates/test.xhtml 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/view/themes/inrelationto/mailtemplates/test.xhtml 2008-02-07 10:40:12 UTC (rev 7390) @@ -1,40 +0,0 @@ -<m:message xmlns="http://www.w3.org/1999/xhtml" - xmlns:m="http://jboss.com/products/seam/mail" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core"> - <m:header name="X-Sent-From" value="JBoss Seam" /> - <m:from name="Seam Wiki" address="do-not-reply(a)jboss.com" /> - <m:to name="#{user.firstname} #{user.lastname}">#{user.email}</m:to> - <m:subject>[Seam Wiki] Registration Confirmation</m:subject> - <m:body> - <html> - <body> - Hello #{user.firstname} #{user.lastname}, - - - you registered an account on the Seam Wiki. You need to click the following link to confirm the - validity of your e-mail address and to activate your account: - - <h:outputLink value="#{preferences.get('Wiki').baseURL}/confirmRegistration.seam?activationCode=#{user.activationCode}">Click this link to activate the account '#{user.username}'</h:outputLink> - - - Regards, - JBoss Seam Wiki - - </body> - </html> - <f:facet name="alternative"> - <h:outputText> -Hello #{user.firstname} #{user.lastname}, - -you registered an account on the Seam Wiki. You need to use the following link to confirm the -validity of your e-mail address and to activate your account: - -#{preferences.get('Wiki').baseURL}/confirmRegistration.seam?activationCode=#{user.activationCode} - -Regards, -JBoss Seam Wiki - </h:outputText> - </f:facet> - </m:body> -</m:message> Modified: trunk/examples/wiki/view/themes/inrelationto/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/inrelationto/template.xhtml 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/view/themes/inrelationto/template.xhtml 2008-02-07 10:40:12 UTC (rev 7390) @@ -116,6 +116,44 @@ return s.substring(s.length - suffix.length) == suffix; } + function formatText(textArea, formatString) { + var inlinePlaceholder = "{i}"; + var blockPlaceholder = "{b}"; + var inline = formatString.indexOf(inlinePlaceholder) != -1; + var block = formatString.indexOf(blockPlaceholder) != -1; + if (!(inline || block)) return; + var prefix = formatString.substring(0, formatString.indexOf(inline ? inlinePlaceholder : blockPlaceholder)); + var suffix = formatString.substring(formatString.indexOf(inline ? inlinePlaceholder : blockPlaceholder)+3, formatString.length); + if (block) { + prefix = "\n" + prefix; + suffix = suffix + "\n"; + } + + if (typeof(textArea.caretPos) != "undefined" && textArea.createTextRange) { + var caretPos = textArea.caretPos; + caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? prefix + caretPos.text + suffix + ' ' : prefix + caretPos.text + suffix; + caretPos.select(); + } else if (typeof(textArea.selectionStart) != "undefined") { + var begin = textArea.value.substr(0, textArea.selectionStart); + var selection = textArea.value.substr(textArea.selectionStart, textArea.selectionEnd - textArea.selectionStart); + var end = textArea.value.substr(textArea.selectionEnd); + var newCursorPos = textArea.selectionStart; + var scrollPos = textArea.scrollTop; + textArea.value = begin + prefix + selection + suffix + end; + if (textArea.setSelectionRange) { + if (selection.length == 0) + textArea.setSelectionRange(newCursorPos + prefix.length, newCursorPos + prefix.length); + else + textArea.setSelectionRange(newCursorPos, newCursorPos + prefix.length + selection.length + suffix.length); + textArea.focus(); + } + textArea.scrollTop = scrollPos; + } else { + textArea.value += prefix + suffix; + textArea.focus(textArea.value.length - 1); + } + } + // ###################### Popups ################################# function deleteConfirmation(message, deleteFunction) { Modified: trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-02-07 10:40:12 UTC (rev 7390) @@ -951,11 +951,6 @@ margin-left: 240px; } -.textAreaHelp { - padding-top: 5px; - vertical-align: top; -} - .textPreview { border: 1px dashed #666; margin-bottom: 10px; Modified: trunk/examples/wiki/view/themes/sfwkorg/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-02-07 03:06:44 UTC (rev 7389) +++ trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-02-07 10:40:12 UTC (rev 7390) @@ -119,6 +119,44 @@ return s.substring(s.length - suffix.length) == suffix; } + function formatText(textArea, formatString) { + var inlinePlaceholder = "{i}"; + var blockPlaceholder = "{b}"; + var inline = formatString.indexOf(inlinePlaceholder) != -1; + var block = formatString.indexOf(blockPlaceholder) != -1; + if (!(inline || block)) return; + var prefix = formatString.substring(0, formatString.indexOf(inline ? inlinePlaceholder : blockPlaceholder)); + var suffix = formatString.substring(formatString.indexOf(inline ? inlinePlaceholder : blockPlaceholder)+3, formatString.length); + if (block) { + prefix = "\n" + prefix; + suffix = suffix + "\n"; + } + + if (typeof(textArea.caretPos) != "undefined" && textArea.createTextRange) { + var caretPos = textArea.caretPos; + caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? prefix + caretPos.text + suffix + ' ' : prefix + caretPos.text + suffix; + caretPos.select(); + } else if (typeof(textArea.selectionStart) != "undefined") { + var begin = textArea.value.substr(0, textArea.selectionStart); + var selection = textArea.value.substr(textArea.selectionStart, textArea.selectionEnd - textArea.selectionStart); + var end = textArea.value.substr(textArea.selectionEnd); + var newCursorPos = textArea.selectionStart; + var scrollPos = textArea.scrollTop; + textArea.value = begin + prefix + selection + suffix + end; + if (textArea.setSelectionRange) { + if (selection.length == 0) + textArea.setSelectionRange(newCursorPos + prefix.length, newCursorPos + prefix.length); + else + textArea.setSelectionRange(newCursorPos, newCursorPos + prefix.length + selection.length + suffix.length); + textArea.focus(); + } + textArea.scrollTop = scrollPos; + } else { + textArea.value += prefix + suffix; + textArea.focus(textArea.value.length - 1); + } + } + // ###################### Popups ################################# function deleteConfirmation(message, deleteFunction) { @@ -387,7 +425,7 @@ <a href="http://seam.demo.jboss.com/home.seam">Hotel Booking</a> and the <a href="http://dvdstore.demo.jboss.com/home.seam">DVD Store</a>. You can find the code for these demos in the - <a href="http:/www.seamframework.org/Download">Seam download package</a>. + <a href="http://www.seamframework.org/Download">Seam download package</a>. </div>

16 years, 10 months

1
0
0 / 0

Seam SVN: r7389 - in trunk/src/main/org/jboss/seam: util and 1 other directory.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2008-02-06 22:06:44 -0500 (Wed, 06 Feb 2008) New Revision: 7389 Modified: trunk/src/main/org/jboss/seam/init/Initialization.java trunk/src/main/org/jboss/seam/util/DTDEntityResolver.java Log: JBSEAM-2046 Modified: trunk/src/main/org/jboss/seam/init/Initialization.java =================================================================== --- trunk/src/main/org/jboss/seam/init/Initialization.java 2008-02-06 20:08:42 UTC (rev 7388) +++ trunk/src/main/org/jboss/seam/init/Initialization.java 2008-02-07 03:06:44 UTC (rev 7389) @@ -215,7 +215,7 @@ NamespaceDescriptor nsInfo = namespaceMap.get(ns); if (nsInfo == null ) { - if ( ns!=null && !ns.equals("http://jboss.com/products/seam/components") ) + if ( ns!=null && ns.length()>0 && !ns.equals("http://jboss.com/products/seam/components") ) { log.warn("namespace declared in components.xml does not resolve to a package annotated @Namespace: " + ns); } Modified: trunk/src/main/org/jboss/seam/util/DTDEntityResolver.java =================================================================== --- trunk/src/main/org/jboss/seam/util/DTDEntityResolver.java 2008-02-06 20:08:42 UTC (rev 7388) +++ trunk/src/main/org/jboss/seam/util/DTDEntityResolver.java 2008-02-07 03:06:44 UTC (rev 7389) @@ -30,73 +30,62 @@ public class DTDEntityResolver implements EntityResolver, Serializable { - private static final long serialVersionUID = -4553926061006790714L; + private static final long serialVersionUID = -4553926061006790714L; - private static final LogProvider log = Logging.getLogProvider(DTDEntityResolver.class ); + private static final LogProvider log = Logging.getLogProvider(DTDEntityResolver.class); - private static final String SEAM_NAMESPACE = "http://jboss.com/products/seam/"; - private static final String USER_NAMESPACE = "classpath://"; + private static final String SEAM_NAMESPACE = "http://jboss.com/products/seam/"; + private static final String USER_NAMESPACE = "classpath://"; - public InputSource resolveEntity(String publicId, String systemId) - { - if ( systemId != null ) - { - log.debug( "trying to resolve system-id [" + systemId + "]" ); - if ( systemId.startsWith( SEAM_NAMESPACE) ) - { - log.debug( "recognized Seam namespace; attempting to resolve on classpath under org/jboss/seam/" ); - String path = "org/jboss/seam/" + systemId.substring( SEAM_NAMESPACE.length() ); - InputStream dtdStream = resolveInSeamNamespace(path); - if ( dtdStream == null ) - { - log.debug( "unable to locate [" + systemId + "] on classpath" ); - } - else - { - log.debug( "located [" + systemId + "] in classpath" ); - InputSource source = new InputSource( dtdStream ); - source.setPublicId( publicId ); - source.setSystemId( systemId ); - return source; - } - } - else if ( systemId.startsWith( USER_NAMESPACE ) ) - { - log.debug( "recognized local namespace; attempting to resolve on classpath" ); - String path = systemId.substring( USER_NAMESPACE.length() ); - InputStream stream = resolveInLocalNamespace( path ); - if ( stream == null ) - { - log.debug( "unable to locate [" + systemId + "] on classpath" ); - } - else - { - log.debug( "located [" + systemId + "] in classpath" ); - InputSource source = new InputSource( stream ); - source.setPublicId( publicId ); - source.setSystemId( systemId ); - return source; - } - } - } - // use default behavior - return null; - } + public InputSource resolveEntity(String publicId, String systemId) + { + if (systemId != null) { + log.debug("trying to resolve system-id [" + systemId + "]"); + if (systemId.startsWith(SEAM_NAMESPACE)) { + log.debug("recognized Seam namespace; attempting to resolve on classpath under org/jboss/seam/"); + String path = "org/jboss/seam/" + systemId.substring(SEAM_NAMESPACE.length()); + + InputStream dtdStream = resolveInSeamNamespace(path); + if (dtdStream == null) { + log.warn("unable to locate [" + systemId + "] on classpath"); + } else { + log.debug("located [" + systemId + "] in classpath"); + InputSource source = new InputSource(dtdStream); + source.setPublicId(publicId); + source.setSystemId(systemId); + return source; + } + } else if (systemId.startsWith(USER_NAMESPACE)) { + log.debug("recognized local namespace; attempting to resolve on classpath"); + String path = systemId.substring(USER_NAMESPACE.length()); + + InputStream stream = resolveInLocalNamespace(path); + if (stream == null) { + log.warn("unable to locate [" + systemId + "] on classpath"); + } else { + log.debug("located [" + systemId + "] in classpath"); + InputSource source = new InputSource(stream); + source.setPublicId(publicId); + source.setSystemId(systemId); + return source; + } + } + } + // use default behavior + return null; + } - protected InputStream resolveInSeamNamespace(String path) - { - return this.getClass().getClassLoader().getResourceAsStream(path); - } + protected InputStream resolveInSeamNamespace(String path) + { + return this.getClass().getClassLoader().getResourceAsStream(path); + } - protected InputStream resolveInLocalNamespace(String path) - { - try - { - return Resources.getResourceAsStream( path, ServletLifecycle.getServletContext() ); - } - catch (Throwable t) - { - return null; - } - } + protected InputStream resolveInLocalNamespace(String path) + { + try { + return Resources.getResourceAsStream(path, ServletLifecycle.getServletContext()); + } catch (Throwable t) { + return null; + } + } }

16 years, 10 months

1
0
0 / 0

Seam SVN: r7388 - in trunk/src/main/org/jboss/seam: framework and 1 other directory.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2008-02-06 15:08:42 -0500 (Wed, 06 Feb 2008) New Revision: 7388 Modified: trunk/src/main/org/jboss/seam/framework-2.1.xsd trunk/src/main/org/jboss/seam/framework/Query.java Log: JBSEAM-2302 Modified: trunk/src/main/org/jboss/seam/framework/Query.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/Query.java 2008-02-06 19:11:17 UTC (rev 7387) +++ trunk/src/main/org/jboss/seam/framework/Query.java 2008-02-06 20:08:42 UTC (rev 7388) @@ -26,9 +26,9 @@ public abstract class Query<T, E> extends PersistenceController<T> //TODO: extend MutableController! { - private static final Pattern FROM_PATTERN = Pattern.compile("(^|\\s)(from)\\s", Pattern.CASE_INSENSITIVE); + private static final Pattern FROM_PATTERN = Pattern.compile("(^|\\s)(from)\\s", Pattern.CASE_INSENSITIVE); + private static final Pattern WHERE_PATTERN = Pattern.compile("\\s(where)\\s", Pattern.CASE_INSENSITIVE); private static final Pattern ORDER_PATTERN = Pattern.compile("\\s(order)(\\s)+by\\s", Pattern.CASE_INSENSITIVE); - private static final Pattern WHERE_PATTERN = Pattern.compile("\\s(where)\\s", Pattern.CASE_INSENSITIVE); private static final Pattern ORDER_COLUMN_PATTERN = Pattern.compile("^\\w*$"); @@ -43,6 +43,8 @@ private String orderColumn; private String orderDirection; + private String groupBy; + private DataModel dataModel; private String parsedEjbql; @@ -247,9 +249,15 @@ builder.append( parsedRestrictions.get(i) ); } } - - if ( getOrder()!=null ) builder.append(" order by ").append( getOrder() ); + if (getGroupBy()!=null) { + builder.append(" group by ").append(getGroupBy()); + } + + if (getOrder()!=null) { + builder.append(" order by ").append( getOrder() ); + } + return builder.toString(); } @@ -362,6 +370,16 @@ refresh(); } + + + public String getGroupBy() { + return groupBy; + } + + public void setGroupBy(String groupBy) { + this.groupBy = groupBy; + } + /** * The order clause of the query */ @@ -371,6 +389,8 @@ if (column == null) { return order; + + } String direction = getOrderDirection(); Modified: trunk/src/main/org/jboss/seam/framework-2.1.xsd =================================================================== --- trunk/src/main/org/jboss/seam/framework-2.1.xsd 2008-02-06 19:11:17 UTC (rev 7387) +++ trunk/src/main/org/jboss/seam/framework-2.1.xsd 2008-02-06 20:08:42 UTC (rev 7388) @@ -18,12 +18,14 @@ <xs:attribute name="ejbql" type="xs:string"/> <xs:attribute name="max-results" type="xs:integer"/> <xs:attribute name="order" type="xs:string"/> + <xs:attribute name="group-by" type="xs:string"/> </xs:attributeGroup> <xs:element name="restrictions" type="components:multiValuedProperty"/> <xs:element name="hints" type="components:mapProperty"/> <xs:element name="ejbql" type="xs:string"/> <xs:element name="order" type="xs:string"/> + <xs:element name="group-by" type="xs:string"/> <xs:element name="entity-query"> <xs:complexType mixed="true"> @@ -31,6 +33,7 @@ <xs:element minOccurs="0" maxOccurs="1" ref="framework:ejbql"/> <xs:element minOccurs="0" maxOccurs="1" ref="framework:order"/> <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:group-by"/> <xs:element minOccurs="0" maxOccurs="1" ref="framework:hints"/> </xs:choice> <xs:attributeGroup ref="components:attlist.component"/> @@ -47,6 +50,7 @@ <xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:element minOccurs="0" maxOccurs="1" ref="framework:ejbql"/> <xs:element minOccurs="0" maxOccurs="1" ref="framework:order"/> + <xs:element minOccurs="0" maxOccurs="1" ref="framework:group-by"/> <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/> </xs:choice> <xs:attributeGroup ref="components:attlist.component"/>

16 years, 10 months

1
0
0 / 0

Seam SVN: r7387 - trunk/doc/reference/en/modules.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2008-02-06 14:11:17 -0500 (Wed, 06 Feb 2008) New Revision: 7387 Modified: trunk/doc/reference/en/modules/itext.xml Log: JBSEAM-2372 Modified: trunk/doc/reference/en/modules/itext.xml =================================================================== --- trunk/doc/reference/en/modules/itext.xml 2008-02-06 19:09:48 UTC (rev 7386) +++ trunk/doc/reference/en/modules/itext.xml 2008-02-06 19:11:17 UTC (rev 7387) @@ -1484,13 +1484,13 @@ <programlisting><components xmlns="http://jboss.com/products/seam/components" xmlns:pdf="http://jboss.com/products/seam/pdf"> - <pdf:documentStore use-extensions="true" /> + <pdf:document-store use-extensions="true" /> </components></programlisting> <para> Generated documents are stored in conversation scope and will expire when the conversation ends. At that point, references to the document will be invalid. To You can specify a default view to be shown when a document does not exist using the <literal>error-page</literal> property of the documentStore. </para> - <programlisting><pdf:documentStore use-extensions="true" error-page="/pdfMissing.seam" /></programlisting> + <programlisting><pdf:document-store use-extensions="true" error-page="/pdfMissing.seam" /></programlisting> </section> </section>

16 years, 10 months

1
0
0 / 0

Seam SVN: r7386 - branches/Seam_2_0/doc/reference/en/modules.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2008-02-06 14:09:48 -0500 (Wed, 06 Feb 2008) New Revision: 7386 Modified: branches/Seam_2_0/doc/reference/en/modules/itext.xml Log: JBSEAM-2372 Modified: branches/Seam_2_0/doc/reference/en/modules/itext.xml =================================================================== --- branches/Seam_2_0/doc/reference/en/modules/itext.xml 2008-02-06 19:07:35 UTC (rev 7385) +++ branches/Seam_2_0/doc/reference/en/modules/itext.xml 2008-02-06 19:09:48 UTC (rev 7386) @@ -1478,19 +1478,19 @@ <url-pattern>*.pdf</url-pattern> </servlet-mapping></programlisting> - <para> The <literal>useExtensions</literal> option on the document store component completes the + <para> The <literal>use-extensions</literal> option on the document store component completes the functionality by instructing the document store to generate URLs with the correct filename extension for the document type being generated. </para> <programlisting><components xmlns="http://jboss.com/products/seam/components" xmlns:pdf="http://jboss.com/products/seam/pdf"> - <pdf:documentStore useExtensions="true" /> + <pdf:document-store use-extensions="true" /> </components></programlisting> <para> Generated documents are stored in conversation scope and will expire when the conversation ends. At that point, references to the document will be invalid. To You can specify a default view to be shown - when a document does not exist using the <literal>errorPage</literal> property of the documentStore. </para> - <programlisting><pdf:documentStore useExtensions="true" errorPage="/pdfMissing.seam" /></programlisting> + when a document does not exist using the <literal>error-page</literal> property of the document-store. </para> + <programlisting><pdf:document-store use-extensions="true" error-page="/pdfMissing.seam" /></programlisting> </section> </section>

16 years, 10 months

1
0
0 / 0

Seam SVN: r7385 - trunk/doc/reference/en/modules.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2008-02-06 14:07:35 -0500 (Wed, 06 Feb 2008) New Revision: 7385 Modified: trunk/doc/reference/en/modules/itext.xml Log: JBSEAM-2372 Modified: trunk/doc/reference/en/modules/itext.xml =================================================================== --- trunk/doc/reference/en/modules/itext.xml 2008-02-06 14:07:36 UTC (rev 7384) +++ trunk/doc/reference/en/modules/itext.xml 2008-02-06 19:07:35 UTC (rev 7385) @@ -1478,19 +1478,19 @@ <url-pattern>*.pdf</url-pattern> </servlet-mapping></programlisting> - <para> The <literal>useExtensions</literal> option on the document store component completes the + <para> The <literal>use-extensions</literal> option on the document store component completes the functionality by instructing the document store to generate URLs with the correct filename extension for the document type being generated. </para> <programlisting><components xmlns="http://jboss.com/products/seam/components" xmlns:pdf="http://jboss.com/products/seam/pdf"> - <pdf:documentStore useExtensions="true" /> + <pdf:documentStore use-extensions="true" /> </components></programlisting> <para> Generated documents are stored in conversation scope and will expire when the conversation ends. At that point, references to the document will be invalid. To You can specify a default view to be shown - when a document does not exist using the <literal>errorPage</literal> property of the documentStore. </para> - <programlisting><pdf:documentStore useExtensions="true" errorPage="/pdfMissing.seam" /></programlisting> + when a document does not exist using the <literal>error-page</literal> property of the documentStore. </para> + <programlisting><pdf:documentStore use-extensions="true" error-page="/pdfMissing.seam" /></programlisting> </section> </section>

16 years, 10 months

1
0
0 / 0

Seam SVN: r7384 - trunk/src/main/org/jboss/seam/security.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-02-06 09:07:36 -0500 (Wed, 06 Feb 2008) New Revision: 7384 Modified: trunk/src/main/org/jboss/seam/security/Identity.java Log: modified logic for alreadyLoggedIn test Modified: trunk/src/main/org/jboss/seam/security/Identity.java =================================================================== --- trunk/src/main/org/jboss/seam/security/Identity.java 2008-02-06 12:36:18 UTC (rev 7383) +++ trunk/src/main/org/jboss/seam/security/Identity.java 2008-02-06 14:07:36 UTC (rev 7384) @@ -209,12 +209,14 @@ { try { - if (!authenticate()) + if (isLoggedIn(false) && isCredentialsSet()) { if (Events.exists()) Events.instance().raiseEvent(EVENT_ALREADY_LOGGED_IN); return "loggedIn"; } + authenticate(); + if ( log.isDebugEnabled() ) { log.debug("Login successful for: " + getUsername()); @@ -250,10 +252,9 @@ /** * - * @return boolean true if authentication is attempted, false if it is not. * @throws LoginException */ - public boolean authenticate() + public void authenticate() throws LoginException { // If we're already authenticated, then don't authenticate again @@ -262,12 +263,7 @@ principal = null; subject = new Subject(); authenticate( getLoginContext() ); - return true; } - else - { - return false; - } } protected void authenticate(LoginContext loginContext)

16 years, 10 months

1
0
0 / 0

Seam SVN: r7382 - branches/Seam_2_0/doc/reference.

by seam-commits＠lists.jboss.org

Author: petemuir Date: 2008-02-06 07:34:18 -0500 (Wed, 06 Feb 2008) New Revision: 7382 Modified: branches/Seam_2_0/doc/reference/build.xml Log: test commit Modified: branches/Seam_2_0/doc/reference/build.xml =================================================================== --- branches/Seam_2_0/doc/reference/build.xml 2008-02-06 12:22:41 UTC (rev 7381) +++ branches/Seam_2_0/doc/reference/build.xml 2008-02-06 12:34:18 UTC (rev 7382) @@ -7,6 +7,7 @@ language, or you can call lang.revdiff to get a difference report for a particular language, compared with the English reference. --> + <project name="ReferenceDocumentation" default="all.doc" basedir=".">  <dirname property="imported.basedir" file="${ant.file.ReferenceDocumentation}"/>

16 years, 10 months

1
0
0 / 0

Seam SVN: r7381 - trunk.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-02-06 07:22:41 -0500 (Wed, 06 Feb 2008) New Revision: 7381 Modified: trunk/readme.txt Log: minor (svn housekeeping test) Modified: trunk/readme.txt =================================================================== --- trunk/readme.txt 2008-02-06 12:18:48 UTC (rev 7380) +++ trunk/readme.txt 2008-02-06 12:22:41 UTC (rev 7381) @@ -1,6 +1,6 @@ JBoss Seam - Contextual Component framework for Java EE 5 ========================================================= -version 2.0.1.CR2, January 2008 +version 2.1.0.ALPHA, February 2008 This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt).

16 years, 10 months

1
0
0 / 0

Seam SVN: r7379 - in trunk/examples/wiki: src/etc and 34 other directories.

by seam-commits＠lists.jboss.org

Author: christian.bauer(a)jboss.com Date: 2008-02-06 05:00:05 -0500 (Wed, 06 Feb 2008) New Revision: 7379 Added: trunk/examples/wiki/src/etc/META-INF/components-test.xml trunk/examples/wiki/src/etc/i18n/ trunk/examples/wiki/src/etc/i18n/messages_blogArchive_en.properties trunk/examples/wiki/src/etc/i18n/messages_blogDirectory_en.properties trunk/examples/wiki/src/etc/i18n/messages_blogRecentEntries_en.properties trunk/examples/wiki/src/etc/i18n/messages_dirMenu_en.properties trunk/examples/wiki/src/etc/i18n/messages_docPager_en.properties trunk/examples/wiki/src/etc/i18n/messages_en.properties trunk/examples/wiki/src/etc/i18n/messages_faqBrowser_en.properties trunk/examples/wiki/src/etc/i18n/messages_feedAggregator_en.properties trunk/examples/wiki/src/etc/i18n/messages_feedConnector_en.properties trunk/examples/wiki/src/etc/i18n/messages_feedTeasers_en.properties trunk/examples/wiki/src/etc/i18n/messages_flash_en.properties trunk/examples/wiki/src/etc/i18n/messages_forumTopPosters_en.properties trunk/examples/wiki/src/etc/i18n/messages_forum_en.properties trunk/examples/wiki/src/etc/i18n/messages_jiraConnector_en.properties trunk/examples/wiki/src/etc/i18n/messages_jiraIssueList_en.properties trunk/examples/wiki/src/etc/i18n/messages_lastModifiedDocuments_en.properties trunk/examples/wiki/src/etc/i18n/messages_tags_en.properties trunk/examples/wiki/src/etc/i18n/messages_userProfile_en.properties trunk/examples/wiki/src/etc/production.sql trunk/examples/wiki/view/themes/inrelationto/mailtemplates/test.xhtml Removed: trunk/examples/wiki/src/etc/import-dev.sql trunk/examples/wiki/src/etc/import-prod.sql trunk/examples/wiki/src/etc/messages_blogArchive_en.properties trunk/examples/wiki/src/etc/messages_blogDirectory_en.properties trunk/examples/wiki/src/etc/messages_blogRecentEntries_en.properties trunk/examples/wiki/src/etc/messages_dirMenu_en.properties trunk/examples/wiki/src/etc/messages_docPager_en.properties trunk/examples/wiki/src/etc/messages_faqBrowser_en.properties trunk/examples/wiki/src/etc/messages_feedAggregator_en.properties trunk/examples/wiki/src/etc/messages_feedConnector_en.properties trunk/examples/wiki/src/etc/messages_feedTeasers_en.properties trunk/examples/wiki/src/etc/messages_flash_en.properties trunk/examples/wiki/src/etc/messages_forumTopPosters_en.properties trunk/examples/wiki/src/etc/messages_forum_en.properties trunk/examples/wiki/src/etc/messages_jiraConnector_en.properties trunk/examples/wiki/src/etc/messages_jiraIssueList_en.properties trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties trunk/examples/wiki/src/etc/messages_tags_en.properties trunk/examples/wiki/src/etc/messages_userProfile_en.properties trunk/examples/wiki/src/etc/security.drl trunk/examples/wiki/src/etc/wiki.skin.properties trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumTopic.java trunk/examples/wiki/src/main/seam.properties trunk/examples/wiki/src/test/components.properties Modified: trunk/examples/wiki/build.xml trunk/examples/wiki/src/etc/META-INF/components-dev.xml trunk/examples/wiki/src/etc/META-INF/components-prod.xml trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml trunk/examples/wiki/src/etc/WEB-INF/components.xml trunk/examples/wiki/src/etc/WEB-INF/faces-config.xml trunk/examples/wiki/src/etc/WEB-INF/web.xml trunk/examples/wiki/src/main/org/jboss/seam/wiki/WikiInit.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FileServlet.java trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml trunk/examples/wiki/view/dirDisplay_d.xhtml trunk/examples/wiki/view/dirDisplay_m.xhtml trunk/examples/wiki/view/dirEdit_d.xhtml trunk/examples/wiki/view/docDisplay_m.xhtml trunk/examples/wiki/view/includes/attachmentDisplay.xhtml trunk/examples/wiki/view/includes/captchaEntry.xhtml trunk/examples/wiki/view/includes/formFieldDecorate.xhtml trunk/examples/wiki/view/includes/ownerSelector.xhtml trunk/examples/wiki/view/includes/pluginPreferencesForm.xhtml trunk/examples/wiki/view/includes/preferences/editor.xhtml trunk/examples/wiki/view/includes/statusIndicator.xhtml trunk/examples/wiki/view/includes/userControl.xhtml trunk/examples/wiki/view/includes/wikiTextEditor.xhtml trunk/examples/wiki/view/includes/wikiUploadImageEditor.xhtml trunk/examples/wiki/view/plugins/blogArchive/plugin.xhtml trunk/examples/wiki/view/plugins/blogDirectory/plugin.xhtml trunk/examples/wiki/view/plugins/blogRecentEntries/plugin.xhtml trunk/examples/wiki/view/plugins/dirMenu/dirMenuItem.xhtml trunk/examples/wiki/view/plugins/dirMenu/plugin.xhtml trunk/examples/wiki/view/plugins/docPager/plugin.xhtml trunk/examples/wiki/view/plugins/faqBrowser/faqControls.xhtml trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml trunk/examples/wiki/view/plugins/forumList/forumListControls.xhtml trunk/examples/wiki/view/plugins/forumList/forumListTable.xhtml trunk/examples/wiki/view/plugins/forumList/lastTopicPost.xhtml trunk/examples/wiki/view/plugins/forumPosting/plugin.xhtml trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml trunk/examples/wiki/view/plugins/forumStickyPosting/plugin.xhtml trunk/examples/wiki/view/plugins/forumTopics/topicControls.xhtml trunk/examples/wiki/view/plugins/forumTopics/topicPager.xhtml trunk/examples/wiki/view/plugins/forumTopics/topicTable.xhtml trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml trunk/examples/wiki/view/search_d.xhtml trunk/examples/wiki/view/search_m.xhtml trunk/examples/wiki/view/tagDisplay_d.xhtml trunk/examples/wiki/view/themes/default/m/template.xhtml trunk/examples/wiki/view/themes/default/template.xhtml trunk/examples/wiki/view/themes/inrelationto/m/template.xhtml trunk/examples/wiki/view/themes/inrelationto/template.xhtml trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css trunk/examples/wiki/view/themes/sfwkorg/m/template.xhtml trunk/examples/wiki/view/themes/sfwkorg/template.xhtml trunk/examples/wiki/view/userList_d.xhtml trunk/examples/wiki/view/userRegister_d.xhtml Log: Cleanup and preparation for production Modified: trunk/examples/wiki/build.xml =================================================================== --- trunk/examples/wiki/build.xml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/build.xml 2008-02-06 10:00:05 UTC (rev 7379) @@ -24,7 +24,6 @@ <property name="classes.dir" value="${tmp.dir}/classes"/> <property name="testclasses.dir" value="${tmp.dir}/testclasses"/> -  <property name="test.output.dir" value="${tmp.dir}/test-output"/> <property name="exploded.dir" value="${tmp.dir}/exploded"/> <property name="exploded.war.dir" value="${exploded.dir}/${project.name}.war"/> @@ -174,11 +173,6 @@ <fileset dir="${classes.dir}/org/jboss/seam/wiki/core/model"> <include name="**/*.class"/> </fileset> -  </instrument> </target> @@ -272,30 +266,15 @@ <fileset dir="${src.etc.dir}/WEB-INF"> <patternset refid="meta.files"/> </fileset> -  - <filterset> - <filter token="jndiPattern" value="${project.name}/#{ejbName}/local"/> - <filter token="seamStartsPersistenceUnit" value="true"/> - <filter token="ejbTransaction" value="false"/> - </filterset> </copy>  <copy todir="${exploded.war.dir}/WEB-INF/classes"> <fileset dir="${src.etc.dir}"> - <include name="security.drl" /> - <include name="messages*.properties"/> - <include name="*jpdl.xml"/> - <include name="jbpm.cfg.xml"/> - <include name="*.skin.properties"/> + <include name="i18n/messages*.properties"/> <include name="ehcache.xml"/> </fileset> </copy> - <copy tofile="${exploded.war.dir}/WEB-INF/classes/import.sql" - file="${src.etc.dir}/import-${profile}.sql" - overwrite="true"/> -  - <replace file="${exploded.war.dir}/WEB-INF/classes/import.sql" token="@@LF@@" value="'||char(10)||'"/>  <copy todir="${exploded.war.dir}/WEB-INF/classes/META-INF"> @@ -312,11 +291,6 @@ overwrite="true"> </copy> -  - </target> <target name="copydatasets" if="importdata"> @@ -394,24 +368,14 @@ <delete dir="${wiki.dist.dir}"/> <mkdir dir="${wiki.dist.dir}"/> +  <jar jarfile="${wiki.dist.dir}/${project.name}.war" basedir="${exploded.war.dir}"/> +  <copy tofile="${wiki.dist.dir}/${project.name}-ds.xml" file="${src.etc.dir}/${project.name}-${profile}-ds.xml"/> - <copy tofile="${wiki.dist.dir}/${project.name}-data.sql" - file="${src.etc.dir}/import-prod.sql" - overwrite="true"/> -  - <replaceregexp file="${wiki.dist.dir}/${project.name}-data.sql" - match="(.+)" - replace="\1;" - byline="true"/> - -  - <replace file="${wiki.dist.dir}/${project.name}-data.sql" token="@@LF@@" value="'||char(10)||'"/> - -  +  <hibernatetool destdir="${basedir}"> <classpath path="${exploded.war.dir}/WEB-INF/classes"/> <jpaconfiguration/>  @@ -424,6 +388,11 @@ format="true"/> </hibernatetool> +  + <copy tofile="${wiki.dist.dir}/${project.name}-data.sql" + file="${src.etc.dir}/production.sql" + overwrite="true"/> +  <antcall target="clean"/> @@ -431,31 +400,6 @@ </target> -  - - <target name="schemaexport" depends="clean, exploderegular, exploderesources" - description="Exports a generated schema to a file"> - - <mkdir dir="${wiki.dist.dir}"/> - - <hibernatetool destdir="${basedir}"> - <classpath path="${exploded.war.dir}/WEB-INF/classes"/> - <jpaconfiguration/>  - <hbm2ddl - drop="false" - create="true" - export="false" - outputfilename="${wiki.dist.dir}/${project.name}-ddl.sql" - delimiter=";" - format="true"/> - </hibernatetool> - -  - <antcall target="clean"/> - - <echo message="Exported DDL to file: ${wiki.dist.dir}/${project-name}-ddl.sql"/> - </target> -  <target name="compiletests" depends="clean, compileclasses, copyjbossembedded" @@ -470,8 +414,7 @@ <src path="${src.test.dir}" /> </javac> -  -  +  <copy todir="${testclasses.dir}"> <fileset dir="${src.test.dir}"> <patternset refid="meta.files"/> @@ -484,7 +427,7 @@ <target name="configuretests" depends="compiletests" description="Copy resources to test path (call from IDE before tests)"> -  +  <copy todir="${testclasses.dir}"> <fileset dir="${classes.dir}"> <include name="**/*"/> @@ -497,18 +440,22 @@ <include name="**/*"/>  <exclude name="META-INF/persistence*.xml"/> - <exclude name="${project.name}-*-ds.xml"/> - <exclude name="import*.sql"/> + <exclude name="META-INF/components*.xml"/> + <exclude name="*-ds.xml"/> + <exclude name="*.sql"/> </fileset> </copy> <copy tofile="${testclasses.dir}/META-INF/persistence.xml" file="${src.etc.dir}/META-INF/persistence-test-war.xml" overwrite="true"/> + <copy tofile="${testclasses.dir}/META-INF/components.xml" + file="${src.etc.dir}/META-INF/components-test.xml" + overwrite="true"/> <copy tofile="${testclasses.dir}/wiki-ds.xml" file="${src.etc.dir}/wiki-test-ds.xml" overwrite="true"/> -  +  <mkdir dir="${testclasses.dir}/META-INF/testbinaries"/> <copy todir="${testclasses.dir}/META-INF/testbinaries"> <fileset dir="${basedir}/testbinaries"> Modified: trunk/examples/wiki/src/etc/META-INF/components-dev.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/components-dev.xml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/META-INF/components-dev.xml 2008-02-06 10:00:05 UTC (rev 7379) @@ -18,6 +18,29 @@ http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> + +  + +  + <component name="wikiInit" class="org.jboss.seam.wiki.WikiInit" precedence="30"> + <property name="appname">lacewiki</property> + <property name="adminContact">+41 123 123 123, admin(a)my.address</property> + <property name="debug">true</property> + </component> + +  + <mail:mail-session host="localhost" port="25"/> + +  + <web:multipart-filter create-temp-files="true" max-request-size="10000000" url-pattern="*.seam"/> + +  + + +  + <core:init debug="false"/> + <persistence:entity-manager-factory name="wikiEntityManagerFactory" persistence-unit-name="wiki"/> +  <component name="dbunitImporter" class="org.jboss.seam.wiki.util.DBUnitImporter" scope="APPLICATION" auto-create="true"> <property name="database">mysql</property> @@ -35,10 +58,4 @@ </property> </component> -  - <component name="wikiInit" class="org.jboss.seam.wiki.WikiInit" precedence="30"> - <property name="adminContact">+41 123 123 123, admin(a)my.address</property> - <property name="debug">true</property> - </component> - </components> Modified: trunk/examples/wiki/src/etc/META-INF/components-prod.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/components-prod.xml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/META-INF/components-prod.xml 2008-02-06 10:00:05 UTC (rev 7379) @@ -18,9 +18,27 @@ http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> + +  + +  <component name="wikiInit" class="org.jboss.seam.wiki.WikiInit" precedence="30"> - <property name="adminContact">christian.bauer(a)gmail.com</property> + <property name="appname">lacewiki</property> + <property name="adminContact">+41 123 123 123, admin(a)my.address</property> <property name="debug">false</property> </component> +  + <mail:mail-session host="localhost" port="25"/> + +  + <web:multipart-filter create-temp-files="true" max-request-size="10000000" url-pattern="*.seam"/> + +  + + +  + <core:init debug="false"/> + <persistence:entity-manager-factory name="wikiEntityManagerFactory" persistence-unit-name="wiki"/> + </components> Added: trunk/examples/wiki/src/etc/META-INF/components-test.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/components-test.xml (rev 0) +++ trunk/examples/wiki/src/etc/META-INF/components-test.xml 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:security="http://jboss.com/products/seam/security" + xmlns:drools="http://jboss.com/products/seam/drools" + xmlns:web="http://jboss.com/products/seam/web" + xmlns:mail="http://jboss.com/products/seam/mail" + xmlns:transaction="http://jboss.com/products/seam/transaction" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation= + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd + http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> + + +  + +  + <component name="wikiInit" class="org.jboss.seam.wiki.WikiInit" precedence="30"> + <property name="appname">lacewiki</property> + <property name="adminContact">+41 123 123 123, admin(a)my.address</property> + <property name="debug">true</property> + </component> + +  + <mail:mail-session host="localhost" port="25"/> + +  + <web:multipart-filter create-temp-files="true" max-request-size="10000000" url-pattern="*.seam"/> + +  + + +  + <core:init debug="false" jndi-pattern="#{ejbName}/local"/> + <transaction:ejb-transaction/> + +</components> Modified: trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/META-INF/persistence-dev-war.xml 2008-02-06 10:00:05 UTC (rev 7379) @@ -37,7 +37,7 @@  <property name="hibernate.generate_statistics" value="true"/> - <property name="hibernate.session_factory_name" value="SessionFactories/laceWikiSF"/> + <property name="hibernate.session_factory_name" value="SessionFactories/lacewikiSF"/>  <property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.util.MonitoringEHCacheProvider"/> Modified: trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/META-INF/persistence-prod-war.xml 2008-02-06 10:00:05 UTC (rev 7379) @@ -32,7 +32,7 @@  <property name="hibernate.generate_statistics" value="true"/> - <property name="hibernate.session_factory_name" value="SessionFactories/laceWikiSF"/> + <property name="hibernate.session_factory_name" value="SessionFactories/lacewikiSF"/>  <property name="hibernate.cache.provider_class" value="org.jboss.seam.wiki.util.MonitoringEHCacheProvider"/> Modified: trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml =================================================================== --- trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/META-INF/persistence-test-war.xml 2008-02-06 10:00:05 UTC (rev 7379) @@ -43,7 +43,7 @@  <property name="hibernate.generate_statistics" value="true"/> - <property name="hibernate.session_factory_name" value="SessionFactories/laceWikiSF"/> + <property name="hibernate.session_factory_name" value="SessionFactories/lacewikiSF"/>  <property name="hibernate.ejb.event.post-insert" Modified: trunk/examples/wiki/src/etc/WEB-INF/components.xml =================================================================== --- trunk/examples/wiki/src/etc/WEB-INF/components.xml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/WEB-INF/components.xml 2008-02-06 10:00:05 UTC (rev 7379) @@ -3,7 +3,6 @@ xmlns:core="http://jboss.com/products/seam/core" xmlns:persistence="http://jboss.com/products/seam/persistence" xmlns:security="http://jboss.com/products/seam/security" - xmlns:drools="http://jboss.com/products/seam/drools" xmlns:web="http://jboss.com/products/seam/web" xmlns:mail="http://jboss.com/products/seam/mail" xmlns:transaction="http://jboss.com/products/seam/transaction" @@ -13,27 +12,10 @@ http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.xsd - http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> -  - - <mail:mail-session host="localhost" port="25"/> - - <web:multipart-filter create-temp-files="true" max-request-size="10000000" url-pattern="*.seam"/> - <web:redirect-filter disabled="true"/>  - -  - -  - - <core:init debug="false" jndi-pattern="@jndiPattern@"/> - -  - <transaction:ejb-transaction installed="@ejbTransaction@"/> -  <core:manager concurrent-request-timeout="2000" conversation-timeout="1200000" @@ -47,11 +29,6 @@ </persistence:parameters> </persistence:filter> -  - <persistence:entity-manager-factory installed="@seamStartsPersistenceUnit@" - name="wikiEntityManagerFactory" - persistence-unit-name="wiki"/> - <component name="restrictedEntityManager" auto-create="true" scope="CONVERSATION" class="org.jboss.seam.wiki.core.dao.WikiManagedPersistenceContext"> <property name="entityManagerFactory">#{wikiEntityManagerFactory}</property> @@ -103,30 +80,31 @@ <core:resource-loader> <core:bundle-names> - <value>messages</value> - <value>messages_blogDirectory</value> - <value>messages_blogArchive</value> - <value>messages_blogRecentEntries</value> - <value>messages_dirMenu</value> - <value>messages_feedTeasers</value> - <value>messages_lastModifiedDocuments</value> - <value>messages_tags</value> - <value>messages_userProfile</value> - <value>messages_forum</value> - <value>messages_flash</value> - <value>messages_docPager</value> - <value>messages_faqBrowser</value> - <value>messages_jiraIssueList</value> - <value>messages_jiraConnector</value> - <value>messages_feedAggregator</value> - <value>messages_feedConnector</value> - <value>messages_forumTopPosters</value> + <value>i18n.messages</value> + <value>i18n.messages_blogDirectory</value> + <value>i18n.messages_blogArchive</value> + <value>i18n.messages_blogRecentEntries</value> + <value>i18n.messages_dirMenu</value> + <value>i18n.messages_feedTeasers</value> + <value>i18n.messages_lastModifiedDocuments</value> + <value>i18n.messages_tags</value> + <value>i18n.messages_userProfile</value> + <value>i18n.messages_forum</value> + <value>i18n.messages_flash</value> + <value>i18n.messages_docPager</value> + <value>i18n.messages_faqBrowser</value> + <value>i18n.messages_jiraIssueList</value> + <value>i18n.messages_jiraConnector</value> + <value>i18n.messages_feedAggregator</value> + <value>i18n.messages_feedConnector</value> + <value>i18n.messages_forumTopPosters</value> </core:bundle-names> </core:resource-loader>  <web:context-filter regex-url-pattern="/(service|servlets)/.+"/> + <web:redirect-filter disabled="true"/>  <component name="wikiUrlRewriteFilter" class="org.jboss.seam.wiki.core.ui.WikiUrlRewriteFilter" precedence="30"> <property name="initParameters"> Modified: trunk/examples/wiki/src/etc/WEB-INF/faces-config.xml =================================================================== --- trunk/examples/wiki/src/etc/WEB-INF/faces-config.xml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/WEB-INF/faces-config.xml 2008-02-06 10:00:05 UTC (rev 7379) @@ -7,7 +7,6 @@ <application> <locale-config> <default-locale>en</default-locale> - <supported-locale>de</supported-locale> </locale-config> <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> </application> Modified: trunk/examples/wiki/src/etc/WEB-INF/web.xml =================================================================== --- trunk/examples/wiki/src/etc/WEB-INF/web.xml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/WEB-INF/web.xml 2008-02-06 10:00:05 UTC (rev 7379) @@ -4,20 +4,6 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> -  - - <context-param> - <param-name>org.richfaces.SKIN</param-name> - <param-value>wiki</param-value> - </context-param> - -  -  <listener> @@ -108,6 +94,7 @@ </servlet-mapping>  <servlet> <servlet-name>Upgrade Servlet</servlet-name> <servlet-class>org.jboss.seam.wiki.core.ui.UpgradeServlet</servlet-class> @@ -116,7 +103,6 @@ <servlet-name>Upgrade Servlet</servlet-name> <url-pattern>/servlets/upgrade/*</url-pattern> </servlet-mapping> - -->  Copied: trunk/examples/wiki/src/etc/i18n/messages_blogArchive_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_blogArchive_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_blogArchive_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_blogArchive_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,3 @@ +blogArchive.label.Archive=Archive +blogArchive.label.Subscribe=Subscribe +blogArchive.label.AllEntries=All Entries \ No newline at end of file Property changes on: trunk/examples/wiki/src/etc/i18n/messages_blogArchive_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_blogDirectory_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_blogDirectory_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_blogDirectory_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_blogDirectory_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,18 @@ +blog.preferences.Name=Plugin: Blog +blog.preferences.PageSize=Number of blog entries per page +blog.preferences.ArchiveSubscribeIcon=Show feed subscribe icon on archive +blog.preferences.RecentEntriesItems=Number of recent entries shown +blog.preferences.RecentEntriesTruncateTitle=Truncate recent entries title after characters +blog.preferences.RecentEntriesSubscribeIcon=Show feed subscribe icon on recent entries + +blogDirectory.label.Attachment=attachment +blogDirectory.label.Attachments=attachments +blogDirectory.label.Showing=Showing +blogDirectory.label.To=to +blogDirectory.label.Of=of +blogDirectory.label.BlogEntries=blog entries +blogDirectory.label.In=in +blogDirectory.label.Tagged=tagged +blogDirectory.label.NoBlogEntriesFound=No blog entries found. +blogDirectory.label.Tag=Tag +blogDirectory.label.Tags=Tags \ No newline at end of file Property changes on: trunk/examples/wiki/src/etc/i18n/messages_blogDirectory_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_blogRecentEntries_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_blogRecentEntries_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_blogRecentEntries_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_blogRecentEntries_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,3 @@ +blogRecentEntries.label.RecentEntries=Recent Entries +blogRecentEntries.label.Subscribe=Subscribe + Property changes on: trunk/examples/wiki/src/etc/i18n/messages_blogRecentEntries_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_dirMenu_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_dirMenu_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_dirMenu_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_dirMenu_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,9 @@ +dirMenu.preferences.Name=Plugin: Directory Menu + +dirMenu.preferences.Title=Default menu title +dirMenu.preferences.MenuLevels=Flatten display of menu tree to levels +dirMenu.preferences.MenuDepth=Maximum depth of menu items +dirMenu.preferences.ShowSubscribeIcon=Show 'Subscribe' icon +dirMenu.preferences.OnlyMenuItems=Display only menu items + +dirMenu.label.Subscribe=Subscribe Property changes on: trunk/examples/wiki/src/etc/i18n/messages_dirMenu_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_docPager_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_docPager_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_docPager_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_docPager_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,3 @@ +docPager.preferences.Name=Plugin: Doc Pager +docPager.preferences.ByProperty=Property used to search previous/next doc +docPager.preferences.ShowNames=Show names of previous/next document Property changes on: trunk/examples/wiki/src/etc/i18n/messages_docPager_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,695 @@ +# TODO: Who uses these unicode arrows? +up=\u2191 +down=\u2193 +left=\u2039 +right=\u203A + +validator.assertFalse=Validation failed +validator.assertTrue=Validation failed +validator.future=Must be a future date +validator.length=Length must be between {min} and {max} +validator.max=Must be less than or equal to {value} +validator.min=Must be greater than or equal to {value} +validator.notNull=May not be null +validator.past=Must be a past date +validator.pattern=Must match "{regex}" +validator.range=Must be between {min} and {max} +validator.size=Size must be between {min} and {max} +validator.email=Must be a well-formed email address + +org.jboss.seam.loginFailed=Login failed, please try again. +org.jboss.seam.loginSuccessful=Login successful, welcome #0. + +org.jboss.seam.TransactionFailed=Transaction failed. +org.jboss.seam.NoConversation=The workspace ended, timed out or was processing another request. +org.jboss.seam.IllegalNavigation=Illegal navigation +org.jboss.seam.ProcessEnded=Process #0 already ended +org.jboss.seam.ProcessNotFound=Process #0 not found +org.jboss.seam.TaskEnded=Task #0 already ended +org.jboss.seam.TaskNotFound=Task #0 not found +org.jboss.seam.NotLoggedIn=Please log in first + +javax.faces.component.UIInput.CONVERSION=Value could not be converted to the expected type +javax.faces.component.UIInput.REQUIRED=A value is required +javax.faces.component.UIInput.UPDATE=An error occurred when processing your submitted information +javax.faces.component.UISelectOne.INVALID=Value is not valid +javax.faces.component.UISelectMany.INVALID=Value is not valid + +javax.faces.converter.BigDecimalConverter.DECIMAL=Value must be a number +javax.faces.converter.BigDecimalConverter.DECIMAL_detail=Value must be a signed decimal number consisting of zero or more digits, optionally followed by a decimal point and fraction, eg. {1} +javax.faces.converter.BigIntegerConverter.BIGINTEGER=Value must be a number +javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail=Value must be a signed integer number consisting of zero or more digits +javax.faces.converter.BooleanConverter.BOOLEAN=Value must be true or false +javax.faces.converter.BooleanConverter.BOOLEAN_detail=Value must be true or false (any value other than true will evaluate to false) +javax.faces.converter.ByteConverter.BYTE=Value must be a number between 0 and 255 +javax.faces.converter.ByteConverter.BYTE_detail=Value must be a number between 0 and 255 +javax.faces.converter.CharacterConverter.CHARACTER=Value must be a character +javax.faces.converter.CharacterConverter.CHARACTER_detail=Value must be a valid ASCII character +javax.faces.converter.DateTimeConverter.DATE=Value must be a date +javax.faces.converter.DateTimeConverter.DATE_detail=Value must be a date, eg. {1} +javax.faces.converter.DateTimeConverter.TIME=Value must be a time +javax.faces.converter.DateTimeConverter.TIME_detail=Value must be a time, eg. {1} +javax.faces.converter.DateTimeConverter.DATETIME=Value must be a date and time +javax.faces.converter.DateTimeConverter.DATETIME_detail=Value must be a date and time, eg. {1} +javax.faces.converter.DateTimeConverter.PATTERN_TYPE=A pattern or type attribute must be specified to convert the value +javax.faces.converter.DoubleConverter.DOUBLE=Value must be a number +javax.faces.converter.DoubleConverter.DOUBLE_detail=Value must be a number between 4.9E-324 and 1.7976931348623157E308 +javax.faces.converter.EnumConverter.ENUM=Value must be convertible to an enum +javax.faces.converter.EnumConverter.ENUM_detail=Value must be convertible to an enum or from the enum that contains the constant {1} +javax.faces.converter.EnumConverter.ENUM_NO_CLASS=Value must be convertible to an enum or from the enum, but no enum class provided +javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail=Value must be convertible to an enum or from the enum, but no enum class provided +javax.faces.converter.FloatConverter.FLOAT=Value must be a number +javax.faces.converter.FloatConverter.FLOAT_detail=Value must be a number between 1.4E-45 and 3.4028235E38 +javax.faces.converter.IntegerConverter.INTEGER=Value must be a number +javax.faces.converter.IntegerConverter.INTEGER_detail=Value must be a number between -2147483648 and 2147483647 +javax.faces.converter.LongConverter.LONG=Value must be a number +javax.faces.converter.LongConverter.LONG_detail=Must be a number between -9223372036854775808 and 9223372036854775807 +javax.faces.converter.NumberConverter.CURRENCY=Value must be a currency amount +javax.faces.converter.NumberConverter.CURRENCY_detail=Value must be a currency amount, eg. {1} +javax.faces.converter.NumberConverter.PERCENT=Value must be a percentage amount +javax.faces.converter.NumberConverter.PERCENT_detail=Value must be a percentage amount, eg. {1} +javax.faces.converter.NumberConverter.NUMBER=Value must be a number +javax.faces.converter.NumberConverter.NUMBER_detail=Value must be a number +javax.faces.converter.NumberConverter.PATTERN=Value must be a number +javax.faces.converter.NumberConverter.PATTERN_detail=Value must be a number +javax.faces.converter.ShortConverter.SHORT=Value must be a number +javax.faces.converter.ShortConverter.SHORT_detail=Value must be a number between -32768 and 32767 + +javax.faces.validator.DoubleRangeValidator.MAXIMUM=Value must be less than or equal to {0} +javax.faces.validator.DoubleRangeValidator.MINIMUM=Value must be greater than or equal to {0} +javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE=Value must be between {0} and {1} +javax.faces.validator.DoubleRangeValidator.TYPE=Value is not of the correct type +javax.faces.validator.LengthValidator.MAXIMUM=Value is must be shorter than or equal to {0} characters +javax.faces.validator.LengthValidator.MINIMUM=Value is must be longer than or equal to {0} characters +javax.faces.validator.LongRangeValidator.MAXIMUM=Value must be less than or equal to {0} +javax.faces.validator.LongRangeValidator.MINIMUM=Value must be greater than or equal to {0} +javax.faces.validator.LongRangeValidator.NOT_IN_RANGE=Value must be between {0} and {1} +javax.faces.validator.LongRangeValidator.TYPE=Value is not of the correct type + +javax.faces.validator.NOT_IN_RANGE=Value must be between {0} and {1} +javax.faces.converter.STRING=Value could not be converted to a string + +# Global + +lacewiki.label.Message=Message +lacewiki.label.OK=OK +lacewiki.label.Cancel=Cancel +lacewiki.label.Left=Left +lacewiki.label.Right=Right +lacewiki.label.Previous=Previous +lacewiki.label.Next=Next + +lacewiki.button.CreateDocument=Create +lacewiki.button.CreateDocument.accesskey=C +lacewiki.button.EditDocument=Edit +lacewiki.button.EditDocument.accesskey=E +lacewiki.button.HistoryDocument=History +lacewiki.button.HistoryDocument.accesskey=I +lacewiki.button.BrowseDirectory=Browse +lacewiki.button.BrowseDirectory.accesskey=B +lacewiki.button.CreateSubdirectory=Create Subdirectory +lacewiki.button.CreateSubdirectory.accesskey=S +lacewiki.button.EditDirectory=Edit Directory +lacewiki.button.EditDirectory.accesskey=E +lacewiki.button.NewDocument=New Document +lacewiki.button.NewDocument.accesskey=N +lacewiki.button.UploadFile=Upload File +lacewiki.button.UploadFile.accesskey=U +lacewiki.button.NewArea=New Area +lacewiki.button.NewArea.accesskey=N +lacewiki.button.EditWikiRoot=Edit Wiki Root +lacewiki.button.EditWikiRoot.accesskey=E +lacewiki.button.Edit=Edit +lacewiki.button.EmptyTrash=Empty Trash + +lacewiki.button.SwitchWorkspace=Switch Workspace +lacewiki.button.SwitchWorkspace.accesskey=W + +lacewiki.button.OK=Ok +lacewiki.button.OK.accesskey=O +lacewiki.button.Cancel=Cancel +lacewiki.button.Cancel.accesskey=C +lacewiki.button.CancelNoKey=Cancel + +lacewiki.button.Remove=Remove +lacewiki.button.Add=Add +lacewiki.button.Save=Save +lacewiki.button.Update=Update +lacewiki.button.Delete=Delete +lacewiki.button.Show=Show +lacewiki.button.Diff=Diff +lacewiki.button.Rollback=Rollback +lacewiki.button.PurgeHistory=Purge History +lacewiki.button.Find=Find +lacewiki.button.FirstPage=First Page +lacewiki.button.PreviousPage=Previous Page +lacewiki.button.NextPage=Next Page +lacewiki.button.LastPage=Last Page +lacewiki.button.Login=Login +lacewiki.button.Logout=Logout +lacewiki.button.Home=Home + +lacewiki.button.Close=Close Workspace +lacewiki.button.Close.accesskey=E +lacewiki.button.ExitEditor=Exit Workspace +lacewiki.button.ExitEditor.accesskey=E + +lacewiki.button.SiteFeed=Subscribe to site +lacewiki.button.DirectoryFeed=Subscribe to directory + +lacewiki.label.PermLink=PermLink +lacewiki.label.WikiLink=WikiLink +lacewiki.label.DirLink=Link to directory +lacewiki.label.Link=Link +lacewiki.label.ReadableBy=Readable by +lacewiki.label.WritableBy=Writable by +lacewiki.label.WriteProtected=Restrict edit access to admins +lacewiki.label.User=User +lacewiki.label.DeleteConfirmation=Delete Confirmation +lacewiki.label.AreYouSureYouWantToDelete=Are you sure you want to delete +lacewiki.label.DeleteAllChildren=? +lacewiki.label.Confirmation=Confirmation +lacewiki.label.AreYouSureYouWantToExecute=Are you sure you want to execute this operation? + +lacewiki.label.January=January +lacewiki.label.February=February +lacewiki.label.March=March +lacewiki.label.April=April +lacewiki.label.May=May +lacewiki.label.June=June +lacewiki.label.July=July +lacewiki.label.August=August +lacewiki.label.September=September +lacewiki.label.October=October +lacewiki.label.November=November +lacewiki.label.December=December + +# Help + +lacewiki.label.help.DialogTitle=Help +lacewiki.button.help.Help=Help +lacewiki.button.help.CloseHelp=Close Help + +# Search + +lacewiki.label.search.Search=Search +lacewiki.label.search.Results +lacewiki.label.search.All=All +lacewiki.label.search.In=In +lacewiki.label.search.Terms=Terms +lacewiki.label.search.ExactPhrase=Exact Phrase +lacewiki.label.search.Results=Results +lacewiki.button.search.Find=Find +lacewiki.button.search.Find.accesskey=F +lacewiki.label.search.Exclude=Exclude +lacewiki.label.search.AtAnyTime=at any time +lacewiki.label.search.Last7Days=last 7 days +lacewiki.label.search.Last30Days=last 30 days +lacewiki.label.search.Last6Months=last 6 months +lacewiki.label.search.To=to +lacewiki.label.search.Of=of +lacewiki.label.search.Hits=hit(s) +lacewiki.label.search.NoHits=No hits, please try again. + +# Verification + +lacewiki.label.VerificationQuestion=Enter characters (ignore circles) +lacewiki.label.VerificationError=The entered characters do not match the shown (case sensitive) characters, please try again. + +# Wiki Text Editor +lacewiki.label.wikiTextEditor.CharactersLeft=chars left +lacewiki.msg.wikiTextEditor.EditThisTextPreviewUpdatesAutomatically=Edit this text, the live preview updates if you stop typing for 3 seconds. + +# Document Display + +lacewiki.label.docDisplay.Tags=Tags +lacewiki.label.docDisplay.Created=Created +lacewiki.label.docDisplay.LastModified=Last Modified +lacewiki.label.docDisplay.Revisions=Revisions +lacewiki.label.docDisplay.Diff=Diff +lacewiki.label.docDisplay.InitialRevision=Initial Revision + +# Directory Display + +lacewiki.label.dirDisplay.Name=Name +lacewiki.label.dirDisplay.RightClickForActions=(right-click for menu) +lacewiki.label.dirDisplay.Owner=Owner +lacewiki.label.dirDisplay.ReadAccess=Read Access +lacewiki.label.dirDisplay.WriteAccess=Write Access +lacewiki.label.dirDisplay.LastModifiedOn=Last Modified On +lacewiki.label.dirDisplay.DirectoryIsEmpty=This directory is empty. +lacewiki.label.dirDisplay.PagerShowing= +lacewiki.label.dirDisplay.PagerTo=to +lacewiki.label.dirDisplay.PagerOf=of +lacewiki.label.dirDisplay.PagerElements= +lacewiki.label.dirDisplay.ShowItems=Show items +lacewiki.label.dirDisplay.All=All +lacewiki.button.dirDisplay.Refresh=Refresh +lacewiki.button.dirDisplay.Refresh.accesskey=F +lacewiki.button.dirDisplay.View=View +lacewiki.button.dirDisplay.ViewNewWindow=View (New Window) +lacewiki.button.dirDisplay.Edit=Edit +lacewiki.button.dirDisplay.Delete=Delete + + +# Tag Display + +lacewiki.label.tagDisplay.Tag=Tag +lacewiki.label.tagDisplay.InDirectory=In Directory +lacewiki.label.tagDisplay.Owner=Owner +lacewiki.label.tagDisplay.CreatedOn=Created On +lacewiki.label.tagDisplay.LastModifiedOn=Last Modified On +lacewiki.label.tagDisplay.NotAvailableForSkin=Tag display is not available with this skin. + +# Attachment Display + +lacewiki.label.attachmentDisplay.Attachments=Attachments + +# Comments + +lacewiki.label.commentsDisplay.Comment=comment +lacewiki.label.commentsDisplay.Comments=comments +lacewiki.label.commentsDisplay.CommentThread=the whole comment thread +lacewiki.button.commentsDisplay.RemoveComment=Remove +lacewiki.button.commentsDisplay.ReplyTo=Reply +lacewiki.button.commentsDisplay.Quote=Quote +lacewiki.button.commentForm.PostComment=Post Comment +lacewiki.button.commentForm.PostComment.accesskey=T +lacewiki.label.commentForm.PostComment=Post Comment +lacewiki.label.commentForm.Name=Name +lacewiki.label.commentForm.Email=E-mail address (optional) +lacewiki.label.commentForm.Homepage=Homepage URL (optional) +lacewiki.label.commentForm.Subject=Subject +lacewiki.label.commentForm.Comment=Comment +lacewiki.button.commentForm.Post=Post +lacewiki.label.comment.FeedEntryTitlePrefix=[Comment] +lacewiki.msg.comment.FeedIntro=This is a comment written in reply to +lacewiki.label.comment.RateThisPosting=Rate this posting +lacewiki.label.comment.Rating=Rating + +# User Control + +lacewiki.label.userControl.Username=Username +lacewiki.label.userControl.Password=Password +lacewiki.button.userControl.Login=Login +lacewiki.button.userControl.Login.accesskey=L +lacewiki.button.userControl.ResetPassword=Reset +lacewiki.button.userControl.Register=Register +lacewiki.button.userControl.Register.accesskey=R +lacewiki.button.userControl.Members=Members +lacewiki.button.userControl.Members.accesskey=M +lacewiki.button.userControl.Logout=Logout +lacewiki.button.userControl.Logout.accesskey=L +lacewiki.button.userControl.Home=Home +lacewiki.button.userControl.Home.accesskey=H +lacewiki.button.userControl.Profile=Profile +lacewiki.button.userControl.Profile.accesskey=P +lacewiki.button.userControl.Admin=Admin +lacewiki.button.userControl.Admin.accesskey=A + +# Password Reset +lacewiki.label.resetPassword.DialogTitle=Reset Password +lacewiki.label.resetPassword.Username=Your username +lacewiki.label.resetPassword.Email=Your e-mail address +lacewiki.button.resetPassword.Reset=Reset Password +lacewiki.label.resetPassword.ResetPasswordOf=Reset password of +lacewiki.label.resetPassword.Repeat=Repeat + + +lacewiki.msg.resetPassword.NotValid=Your account and e-mail address information didn't match, please try again to reset your password. +lacewiki.msg.resetPassword.EmailSent=A new activation code has been sent to your e-mail address, please read this e-mail to reset your password. +lacewiki.msg.resetPassword.PasswordResetPrepared=Please reset your password, enter your new password twice. +lacewiki.msg.resetPassword.Complete=Successfully reset password of account '{0}', please log in. + +# Search Control + +lacewiki.label.searchControl.Search=Search... +lacewiki.button.searchControl.Find=Find +lacewiki.button.searchControl.Find.accesskey=F + +# Administration + +lacewiki.label.adminHome.Administration=Administration +lacewiki.button.adminHome.SystemStatistics=System Statistics +lacewiki.button.adminHome.SystemStatistics.accesskey=Y +lacewiki.button.adminHome.RolesPermissions=Roles & Permissions +lacewiki.button.adminHome.RolesPermissions.accesskey=O +lacewiki.button.adminHome.LinkProtocols=Link Protocols +lacewiki.button.adminHome.LinkProtocols.accesskey=L +lacewiki.button.adminHome.Preferences=Preferences +lacewiki.button.adminHome.Preferences.accesskey=R +lacewiki.button.adminHome.SaveSettings=Save Settings +lacewiki.button.adminHome.SaveSettings.accesskey=S +lacewiki.label.adminHome.SearchIndex=Search Index +lacewiki.label.adminHome.NumOfIndexedDocuments=# of indexed documents +lacewiki.label.adminHome.NumOfIndexedTerms=# of indexed terms +lacewiki.label.adminHome.IndexSize=Index Size +lacewiki.button.adminHome.RebuildIndex=Rebuild Index +lacewiki.label.adminHome.Prefix=Prefix +lacewiki.label.adminHome.TargetLink=Target Link +lacewiki.label.adminHome.TargetWithPlaceHolder=Target with [[link]] placeholder +lacewiki.label.adminHome.NotAvailableForSkin=Administration is not available with this skin. + +# User Home + +lacewiki.label.userHome.MemberAccount=Member Account +lacewiki.label.userHome.EditUser=Edit User +lacewiki.button.userHome.Account=Account +lacewiki.button.userHome.Account.accesskey=N +lacewiki.button.userHome.Profile=Profile +lacewiki.button.userHome.Profile.accesskey=I +lacewiki.button.userHome.Preferences=Preferences +lacewiki.button.userHome.Preferences.accesskey=R +lacewiki.button.userHome.RemovePortrait=Remove Portrait +lacewiki.label.userHome.FirstName=First name +lacewiki.label.userHome.LastName=Last name +lacewiki.label.userHome.Email=E-Mail +lacewiki.label.userHome.Username=Username +lacewiki.label.userHome.Password=Password +lacewiki.label.userHome.RepeatPassword=Repeat password +lacewiki.label.userHome.AccountIsActive=Account is active +lacewiki.label.userHome.Roles=Roles +lacewiki.label.userHome.Portrait=Portrait +lacewiki.label.userHome.UploadPortrait=Upload Portrait +lacewiki.label.userHome.UploadMax=max +lacewiki.label.userHome.Bio=Bio +lacewiki.label.userHome.Website=Website +lacewiki.label.userHome.Location=Location +lacewiki.label.userHome.Occupation=Occupation +lacewiki.label.userHome.Signature=Signature +lacewiki.button.userHome.CreateHomeDirectory=Create Home Directory +lacewiki.button.userHome.CreateHomeDirectory=Create Home Directory +lacewiki.button.userHome.SaveSettings=Save Settings +lacewiki.button.userHome.SaveSettings.accesskey=S +lacewiki.button.userHome.Delete=Delete +lacewiki.button.userHome.Delete.accesskey=D +lacewiki.label.userHome.NotAvailableForSkin=User management is not available with this skin. +lacewiki.msg.userHome.PortraitRemoved=The portrait has been removed, save to make changes permanent. +lacewiki.msg.userHome.WrongPortraitImageType=The file type '{0}' is not supported, the portrait was not updated. + +# User Register + +lacewiki.label.userRegister.Registration=Registration +lacewiki.label.userRegister.RegisterNewAccount=Register new account +lacewiki.label.userRegister.CreateNewAccount=Create new account +lacewiki.label.userRegister.FirstName=First name +lacewiki.label.userRegister.LastName=Last name +lacewiki.label.userRegister.Email=E-Mail +lacewiki.label.userRegister.Username=Username +lacewiki.label.userRegister.Password=Password +lacewiki.label.userRegister.RepeatPassword=Repeat password +lacewiki.button.userRegister.Register=Register +lacewiki.button.userRegister.Register.accesskey=G +lacewiki.button.userRegister.Create=Create Account +lacewiki.button.userRegister.Create.accesskey=C +lacewiki.label.userRegister.NotAvailableForSkin=User registration is not available with this skin. + +# User List + +lacewiki.label.userList.MemberList=Member List +lacewiki.label.userList.Results=Results +lacewiki.button.userList.CreateAccount=Create Account +lacewiki.button.userList.CreateAccount.accesskey=C +lacewiki.label.userList.SearchMembers=Search Members +lacewiki.label.userList.Username=Username +lacewiki.label.userList.FirstName=First name +lacewiki.label.userList.LastName=Last name +lacewiki.label.userList.Email=E-Mail +lacewiki.label.userList.Show=Show +lacewiki.button.userList.Find=Find +lacewiki.button.userList.Find.accesskey=I +lacewiki.label.userList.Found=Found +lacewiki.label.userList.Members=member(s) +lacewiki.label.userList.JoinedOn=Joined +lacewiki.label.userList.LastLoginOn=Last Login +lacewiki.label.userList.NotActivated=Not Activated +lacewiki.button.userList.Edit=Edit +lacewiki.label.userList.NotAvailableForSkin=User search is not available with this skin. + +# User Info + +lacewiki.label.userInfo.UserInfo=User Summary +lacewiki.label.userInfo.NotActivated=Not Activated +lacewiki.label.userInfo.NoProfile=No profile available. +lacewiki.label.userInfo.Name=Name +lacewiki.label.userInfo.JoinedOn=Joined +lacewiki.label.userInfo.LastLoginOn=Last Login +lacewiki.label.userInfo.RatingPoints=Rating Points +lacewiki.button.userInfo.EditAccount=Edit Account +lacewiki.button.userInfo.EditAccount.accesskey=E + +# Document History + +lacewiki.label.docHistory.DocumentHistory=Document History +lacewiki.label.docHistory.CurrentRevision=Current revision +lacewiki.label.docHistory.Parent=Parent +lacewiki.label.docHistory.CreatedOn=Created On +lacewiki.label.docHistory.LastModifiedOn=Last Modified On +lacewiki.label.docHistory.HistoricalRevisions=Historical revisions +lacewiki.button.docHistory.Show=Show +lacewiki.button.docHistory.Diff=Diff +lacewiki.button.docHistory.Rollback=Rollback +lacewiki.button.docHistory.PurgeHistory=Purge History +lacewiki.button.docHistory.PurgeHistory.accesskey=U +lacewiki.msg.docHistory.PurgedHistory=Historical revisions have been cleared. + +# Uploader + +lacewiki.msg.upload.HandlersDontMatch=Wrong file type uploaded, please try again with a different file. +lacewiki.msg.upload.NoData=Please select a file to upload. +lacewiki.label.upload.UploadFile=Upload File +lacewiki.label.upload.Upload=Upload +lacewiki.label.upload.UploadMax=max. +lacewiki.button.upload.Upload=Upload +lacewiki.button.upload.Upload.accesskey=U +lacewiki.button.upload.UploadOverwrite=Upload + +# Upload Edit + +lacewiki.label.uploadEdit.UploadFile=Upload File +lacewiki.label.uploadEdit.EditFile=Edit File +lacewiki.label.uploadEdit.Directory=Directory +lacewiki.label.uploadEdit.CreatedOn=Created on +lacewiki.label.uploadEdit.Name=Name +lacewiki.label.uploadEdit.FileDetails=File Details +lacewiki.label.uploadEdit.Converters=Converters +lacewiki.label.uploadEdit.OriginalImageSize=Original Image Size +lacewiki.label.uploadEdit.Pixel=px +lacewiki.label.uploadEdit.ImagePreview=Image Preview +lacewiki.label.uploadEdit.ShowInDocuments=Show in documents +lacewiki.label.uploadEdit.SmallThumbnail=Small thumbnail +lacewiki.label.uploadEdit.MediumThumbnail=Medium thumbnail +lacewiki.label.uploadEdit.LargeThumbnail=Large thumbnail +lacewiki.label.uploadEdit.FullSize=Full size +lacewiki.label.uploadEdit.AsAttachment=As attachment +lacewiki.label.uploadEdit.Upload=Upload +lacewiki.label.uploadEdit.UploadMax=max. +lacewiki.button.uploadEdit.ZoomOut=Zoom Out +lacewiki.button.uploadEdit.ZoomIn=Zoom In +lacewiki.button.uploadEdit.ActualSize=Actual Size +lacewiki.button.uploadEdit.Save=Save +lacewiki.button.uploadEdit.Save.accesskey=S +lacewiki.button.uploadEdit.Update=Update +lacewiki.button.uploadEdit.Update.accesskey=U +lacewiki.button.uploadEdit.Delete=Delete +lacewiki.button.uploadEdit.Delete.accesskey=D +lacewiki.msg.uploadEdit.UpdateUpload=File {0} has been uploaded. + +# Document Edit + +lacewiki.label.docEdit.CreateDocument=Create Document +lacewiki.label.docEdit.EditDocument=Edit Document +lacewiki.button.docEdit.Content=Content +lacewiki.button.docEdit.Content.accesskey=C +lacewiki.button.docEdit.Properties=Properties +lacewiki.button.docEdit.Properties.accesskey=T +lacewiki.button.docEdit.AdminOptions=Admin Options +lacewiki.button.docEdit.AdminOptions.accesskey=O +lacewiki.label.docEdit.Directory=Directory +lacewiki.label.docEdit.Name=Name +lacewiki.label.docEdit.RenderNameAsTitle=Render name as document title +lacewiki.label.docEdit.MinorChange=Minor change, don't create a new revision +lacewiki.label.docEdit.CreateOnParentFeeds=Create entry on parent directory feeds +lacewiki.label.docEdit.CreateOnSiteFeed=Create entry on global site feed +lacewiki.label.docEdit.PushOnFeeds=Push changes onto feeds +lacewiki.label.docEdit.PushOnParentFeeds=Push changes onto feeds of parent directories +lacewiki.label.docEdit.Content=Content +lacewiki.label.docEdit.EnableLivePreview=Enable live preview +lacewiki.label.docEdit.ShowPluginSettings=Show plugin settings in preview +lacewiki.label.docEdit.CreatedOn=Created on +lacewiki.label.docEdit.Options=Options +lacewiki.label.docEdit.EnableComments=Enable comments +lacewiki.label.docEdit.AllowCommentPosting=Allow posting of new comments +lacewiki.label.docEdit.PushCommentsOnFeeds=Push comments onto feeds of parent directories (except site feed) +lacewiki.label.docEdit.Header=Header +lacewiki.label.docEdit.Footer=Footer +lacewiki.button.docEdit.Save=Save +lacewiki.button.docEdit.Save.accesskey=S +lacewiki.button.docEdit.Update=Update +lacewiki.button.docEdit.Update.accesskey=U +lacewiki.button.docEdit.Delete=Delete +lacewiki.button.docEdit.Delete.accesskey=D + +# Directory Edit + +lacewiki.label.dirEdit.CreateDirectory=Create Directory +lacewiki.label.dirEdit.EditDirectory=Edit Directory +lacewiki.label.dirEdit.Parent=Parent +lacewiki.label.dirEdit.CreatedOn=Created on +lacewiki.label.dirEdit.Name=Name +lacewiki.label.dirEdit.Description=Description +lacewiki.label.dirEdit.DefaultDocument=Default Document +lacewiki.label.dirEdit.NoDefaultDocument=No Default Document +lacewiki.label.dirEdit.MenuItems=Menu items +lacewiki.label.dirEdit.Options=Options +lacewiki.label.dirEdit.EnableFeed=Enable syndication feed +lacewiki.button.dirEdit.ResetFeed=Clear Feed +lacewiki.button.dirEdit.Save=Save +lacewiki.button.dirEdit.Save.accesskey=S +lacewiki.button.dirEdit.Update=Update +lacewiki.button.dirEdit.Update.accesskey=U +lacewiki.button.dirEdit.Delete=Delete +lacewiki.button.dirEdit.Delete.accesskey=D + +# Tag Editor + +lacewiki.label.tagEdit.Tags=Tags +lacewiki.label.tagEdit.PopularTags=Popular tags + +# Owner Selector + +lacewiki.label.ownerSelector.SelectOwner=Select Owner... +lacewiki.button.ownerSelector.Select=Select + +# Clipboard + +lacewiki.label.Clipboard=Clipboard +lacewiki.label.Clipboard.Select=Select +lacewiki.label.Clipboard.All=All +lacewiki.label.Clipboard.None=None +lacewiki.label.Clipboard.Documents=Documents +lacewiki.label.Clipboard.UploadedFiles=Uploaded Files +lacewiki.label.Clipboard.Item=item +lacewiki.label.Clipboard.Items=items +lacewiki.label.Clipboard.Empty=Empty +lacewiki.label.Clipboard.CopySuffix=Copy +lacewiki.button.Clipboard.Copy=Copy +lacewiki.button.Clipboard.Copy.accesskey=C +lacewiki.button.Clipboard.Cut=Cut +lacewiki.button.Clipboard.Cut.accesskey=U +lacewiki.button.Clipboard.Clear=Clear +lacewiki.button.Clipboard.Clear.accesskey=L +lacewiki.button.Clipboard.Paste=Paste +lacewiki.button.Clipboard.Paste.accesskey=P +lacewiki.msg.Clipboard.DuplicatePasteName=The name '{0}' was already in use in this area, renamed item to '{1}'. +lacewiki.msg.Clipboard.DuplicatePasteNameFailure=The name '{0}' was already in use in this area and is too long to be renamed, skipping paste. + + +# Entity update/delete/persist + +lacewiki.msg.Directory.Persist=Directory '{0}' has been saved. +lacewiki.msg.Directory.Update=Directory '{0}' has been updated. +lacewiki.msg.Directory.Delete=Directory '{0}' has been deleted. +lacewiki.msg.Document.Persist=Document '{0}' has been saved. +lacewiki.msg.Document.Update=Document '{0}' has been updated. +lacewiki.msg.Document.Delete=Document '{0}' has been deleted. +lacewiki.msg.Upload.Persist=File '{0}' has been saved. +lacewiki.msg.Upload.Update=File '{0}' has been updated. +lacewiki.msg.Upload.Delete=File '{0}' has been deleted. +lacewiki.msg.User.Persist=User account '{0}' has been saved. +lacewiki.msg.User.Update=User account '{0}' has been updated. +lacewiki.msg.User.Delete=User account '{0}' has been deleted. +lacewiki.msg.Feed.Create=Created syndication feed for this directory. +lacewiki.msg.Feed.Remove=Removed syndication feed of this directory. +lacewiki.msg.Feed.Reset=Queued removal of all feed entries from the syndication feed of this directory, please update to finalize. +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 + +lacewiki.entity.DuplicateName=This name/subject/title is already used, please change it. +lacewiki.entity.NameMustStartWithLetterOrNumber=Name must start with a letter or number and not contain [, ], |, / or #. +lacewiki.entity.NameMustStartWithUppercaseLetterOrNumber=Name must start with an uppercase letter or number. +lacewiki.entity.NameMustNotContainSpecialCharacters=Name can not contain special characters. +lacewiki.entity.UsernameMustStartWithALetterAndOnlyContainLetters=Username must start with a letter, and only contain letters and numbers. +lacewiki.entity.LinkProtokol.PrefixMustOnlyContainLetters=Prefix must only contain letters. + +# Misc messages + +lacewiki.msg.SessionTimeout=Your session has timed out, you will be redirected to the start page. +lacewiki.msg.UsernameExists=A user with that username already exists, please pick a different name. +lacewiki.msg.PasswordControlNoMatch=The passwords don't match, please enter again. +lacewiki.msg.PasswordDoesntMatchPattern=Your password is trivial and easy to guess, please enter a different password. +lacewiki.msg.PasswordOrPasswordControlEmpty=Please enter your password twice! +lacewiki.msg.HomeDirectoryCreated=New home directory has been queued, save settings to commit. +lacewiki.msg.AccountCreatedConfirmationSent=Account activation e-mail was sent to your address, please read it to activate your account. +lacewiki.msg.AccountActivatedPleaseLogin=Your account has been activated, please login. +lacewiki.msg.InvalidActivationCode=The activation code is invalid. +lacewiki.msg.UpdatedCurrentCredentials=You modified your username and/or password, please login again. +lacewiki.msg.SystemSettingsUpdated=System settings updated. +lacewiki.msg.DiffOldVersionDisplayed=Showing historical revision {0}. +lacewiki.msg.HistoricalNodeNotFound=Couldn't find historical node: {0}. +lacewiki.msg.DiffCreated=Comparing current revision with historical revision {0}. +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} +lacewiki.msg.ImportOk=Created file '{0}' in current directory. +lacewiki.msg.OptimisticLockError=Someone modified the same record while you were editing it. Your workspace has been closed. +lacewiki.msg.AccessDenied=Access Denied +lacewiki.msg.FatalError=An unrecoverable error occured, please check the application log or contact the administrator! +lacewiki.msg.Trash.Emptied=All items in the trash have been permanently deleted. +lacewiki.msg.AutomaticallyGeneratedFeed=Aggregated Feed + +# Preferences Editors +lacewiki.preferences.editor.SelectNone=(None) + + +# Core Preferences + +lacewiki.preferences.wiki.Name=Core: Wiki +lacewiki.preferences.wiki.BaseURL=Static URL (in e-mails etc.) without trailing slash (e.g. 'http://my.wiki.server/installdir') +lacewiki.preferences.wiki.TimeZone=Timezone of server (ID as defined in java.util.TimeZone +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 +lacewiki.preferences.wiki.FeedTitlePrefix=Feed title prefix +lacewiki.preferences.wiki.PurgeFeedEntriesAfterDays=Feed entries are purged after days +lacewiki.preferences.wiki.AtSymbolReplacement=Replace @ symbol in e-mail addresses with +lacewiki.preferences.wiki.ShowEmailToLoggedInOnly=Show e-mail addresses only to logged-in users +lacewiki.preferences.wiki.MainMenuLevels=Main menu is flattened to levels (0 for unlimited visible levels) +lacewiki.preferences.wiki.MainMenuDepth=Main menu maximum depth of directories +lacewiki.preferences.wiki.MainMenuShowAdminOnly=Main menu includes only directories owned by system administrator +lacewiki.preferences.wiki.ShowDocumentCreatorHistory=Show document creator/edit history in document footer +lacewiki.preferences.wiki.ShowTags=Show document tags in document footer +lacewiki.preferences.wiki.ShowSiteFeedInMenu=Show global site feed in main menu +lacewiki.preferences.wiki.WorkspaceSwitcherDescriptionLength=Truncate workspace switcher description after characters + +lacewiki.preferences.userManagement.Name=Core: User Management +lacewiki.preferences.userManagement.ActivationCodeSalt=Secret salt used to generate activation codes +lacewiki.preferences.userManagement.PasswordRegex=Regex used for password strength verification +lacewiki.preferences.userManagement.NewUserInRole=Default role of new user +lacewiki.preferences.userManagement.EnableRegistration=Enable public user registration +lacewiki.preferences.userManagement.CreateHomeAfterUserActivation=Create home directory for new user after activation +lacewiki.preferences.userManagement.HomepageDefaultContent=Content of created home page + +lacewiki.preferences.documentEditor.Name=Core: Document Editor +lacewiki.preferences.documentEditor.MinorRevisionEnabled=Enable 'Minor Revision' checkbox by default +lacewiki.preferences.documentEditor.RegularEditAreaRows=Rows shown in text editor by default +lacewiki.preferences.documentEditor.RegularEditAreaColumns=Columns shown in text editor by default + +lacewiki.preferences.comments.Name=Core: Comments +lacewiki.preferences.comments.ListAscending=List flat comments ascending by date (or descending) +lacewiki.preferences.comments.EnableByDefault=Enable comments by default for new documents +lacewiki.preferences.comments.Threaded=Threaded comment display (or flat) + Property changes on: trunk/examples/wiki/src/etc/i18n/messages_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_faqBrowser_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_faqBrowser_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_faqBrowser_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_faqBrowser_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,20 @@ +faqBrowser.label.Category=FAQ Category +faqBrowser.label.Question=Question +faqBrowser.label.Updated=Updated +faqBrowser.label.NoQuestionsInCategory=No questions in this category. +faqBrowser.button.NewQuestion=New Question +faqBrowser.button.NewQuestion.accesskey=Q + +faqBrowser.label.NewFaqQuestion=New question in category +faqBrowser.label.NewQuestionTitle=Your question? +faqBrowser.label.QuestionTitle=Question +faqBrowser.label.QuestionText=Text +faqBrowser.button.SaveNoKey=Save +faqBrowser.button.CancelNoKey=Cancel + +faqBrowser.msg.Question.Persist=Question '{0}' has been saved. +faqBrowser.msg.Question.Update=Question '{0}' has been updated. +faqBrowser.msg.Question.Delete=Question '{0}' has been deleted. + +faqBrowser.msg.TreeNotFound=Could not find FAQ tree, please create a default document with [<=faqBrowser] header! +faqBrowser.msg.TreeEmpty=No FAQ categories found, create subdirectories in the current directory. \ No newline at end of file Property changes on: trunk/examples/wiki/src/etc/i18n/messages_faqBrowser_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_feedAggregator_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_feedAggregator_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_feedAggregator_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_feedAggregator_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,16 @@ +feedAggregator.preferences.Name=Plugin: Feed Aggregator +feedAggregator.preferences.Title=Title of aggregator box +feedAggregator.preferences.Urls=URLs of feeds to aggregate, space separated +feedAggregator.preferences.NumberOfFeedEntries=Number of feed entries +feedAggregator.preferences.TruncateDescription=Truncate description text after characters +feedAggregator.preferences.HideDate=Hide date display +feedAggregator.preferences.HideAuthor=Hide author display +feedAggregator.preferences.HideFeedInfo=Hide link to feed +feedAggregator.preferences.HideDescription=Hide feed entry text +feedAggregator.preferences.HideTitle=Hide feed entry title +feedAggregator.preferences.AggregateId=Identifier for aggregate (enables subscription) + +feedAggregator.label.More=more... +feedAggregator.label.By=by +feedAggregator.label.Subscribe=Subscribe +feedAggregator.label.NoEntriesFound=No feed entries found. \ No newline at end of file Copied: trunk/examples/wiki/src/etc/i18n/messages_feedConnector_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_feedConnector_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_feedConnector_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_feedConnector_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,4 @@ +feedConnector.preferences.Name=Remote Connector: Feeds +feedConnector.preferences.ConnectionTimeoutSeconds=Remote connection timeout in seconds (TODO:currently not used!) +feedConnector.preferences.FeedCacheUpdateTimeoutSeconds=Feed cache update timeout in seconds +feedConnector.preferences.FeedCacheIdleTimeoutSeconds=Feed cache idle timeout in seconds Copied: trunk/examples/wiki/src/etc/i18n/messages_feedTeasers_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_feedTeasers_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_feedTeasers_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_feedTeasers_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,9 @@ +feedTeasers.preferences.Name=Plugin: Feed Teasers +feedTeasers.preferences.Title=Title of teaser box +feedTeasers.preferences.Feed=Feed +feedTeasers.preferences.NumberOfTeasers=Number of feed entries +feedTeasers.preferences.TruncateDescription=Truncate teaser text after characters +feedTeasers.preferences.ShowAuthor=Show author name + +feedTeasers.label.More=more... +feedTeasers.label.By=by Property changes on: trunk/examples/wiki/src/etc/i18n/messages_feedTeasers_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_flash_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_flash_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_flash_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_flash_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,8 @@ +flash.preferences.Name=Plugin: Flash +flash.preferences.FlashURL=URL of flash movie +flash.preferences.Width=Width in pixels +flash.preferences.Height=Height in pixels +flash.preferences.AllowedDomains=Comma-separated list of allowed domain names + +flash.msg.URLNotSupplied=[Flash Macro: Add 'url' macro parameter to embed flash movie.] +flash.msg.URLNotAllowed=[Flash Macro: The flash URL you supplied is not in the list of valid domains, please ask the system administrator to add it.] Property changes on: trunk/examples/wiki/src/etc/i18n/messages_flash_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_forumTopPosters_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_forumTopPosters_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_forumTopPosters_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_forumTopPosters_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,12 @@ +forumTopPosters.preferences.Name=Plugin: Forum Top Posters +forumTopPosters.preferences.Title=Title of box +forumTopPosters.preferences.NumberOfPosters=Number of posters in list +forumTopPosters.preferences.ForumLink=Wiki link to forum start page (topic list) +forumTopPosters.preferences.ExcludeRoles=Exclude users with role name (space separated) + +forumTopPosters.label.Position=Position +forumTopPosters.label.User=User +forumTopPosters.label.JoinedOn=Joined On +forumTopPosters.label.RatingPoints=Rating Points + +forumTopPosters.label.NoPostersFound=No posters with rating points found. Copied: trunk/examples/wiki/src/etc/i18n/messages_forum_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_forum_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_forum_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_forum_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,102 @@ +forum.preferences.Name=Plugin: Forum +forum.preferences.TopicsPerPage=Number of topics per page +forum.preferences.NotifyMeOfReplies=Enable e-mail reply notification switch by default + +forum.label.Showing=Showing +forum.label.To=to +forum.label.Of=of +forum.label.Topics=topics +forum.label.Joined=Joined On + +forum.label.Forum=Forum +forum.label.TopicCount=Topics +forum.label.PostCount=Posts +forum.label.NewestTopic=Newest Topic +forum.label.LatestPost=Last Post +forum.label.Feed=Feed +forum.label.EnableFeed=Enable syndication feed (disabling invalidates subcriber link) + +forum.label.EditForum=Edit Forum +forum.label.NewForum=New Forum + +forum.label.NewTopic=New Topic +forum.label.Subject=Subject +forum.label.Message=Message +forum.label.Options=Options +forum.label.OpenTopicAllowReplies=Open topic, allow replies +forum.label.StickyPosting=Sticky posting +forum.label.NotifyMeOfReplies=Notify me via e-mail of any replies + +forum.label.Reply=Reply +forum.label.NewReply=New Reply +forum.label.Replies=Replies + +forum.label.ForumName=Forum Name +forum.label.ForumDescription=Description + +forum.msg.NoForumsFound=No forums found. + +forum.button.NewForum=New Forum +forum.button.NewForum.accesskey=N +forum.button.ManageForums=Manage Forums +forum.button.ManageForums.accesskey=G + +forum.button.Edit=Edit +forum.button.ResetFeed=Clear Feed +forum.button.MoveUp=Move Up +forum.button.MoveDown=Move Down +forum.button.SaveNoKey=Save +forum.button.Save=Save +forum.button.Save.accesskey=S +forum.button.Update=Update +forum.button.Update.accesskey=U +forum.button.Remove=Delete +forum.button.Remove.accesskey=Delete +forum.button.CancelNoKey=Cancel +forum.button.Cancel=Cancel +forum.button.Cancel.accesskey=C +forum.button.Exit=Exit +forum.button.Exit.accesskey=E +forum.button.NewTopic=New Topic +forum.button.NewTopic.accesskey=N +forum.button.ForumList=Forum List +forum.button.ForumList.accesskey=O +forum.button.TopicList=Topic List +forum.button.TopicList.accesskey=T +forum.button.Reply=Reply +forum.button.Reply.accesskey=E +forum.button.Reply.nokey=Reply +forum.button.Quote=Quote +forum.button.Quote.accesskey=Q +forum.button.Quote.nokey=Quote +forum.button.RemoveReply=Remove +forum.button.PreviousPosting=Previous +forum.button.PreviousPosting.accesskey=V +forum.button.NextPosting=Next +forum.button.NextPosting.accesskey=N + +forum.label.replyForm.Name=Name +forum.label.replyForm.Email=E-mail address (optional) +forum.label.replyForm.Homepage=Homepage URL (optional) +forum.label.replyForm.Subject=Subject +forum.label.replyForm.Message=Message + +forum.label.WroteOn=wrote on +forum.label.reply.FeedEntryTitlePrefix=Re: + +forum.msg.Feed.Create=Created syndication feed for this forum. +forum.msg.Feed.Remove=Removed syndication feed of this forum. +forum.msg.Feed.Reset=Queued removal of all feed entries from the syndication feed of this directory, please update to finalize. + +forum.msg.Forum.Persist=Forum '{0}' has been saved. +forum.msg.Forum.Update=Forum '{0}' has been updated. +forum.msg.Forum.Delete=Forum '{0}' has been deleted. + +forum.msg.Topic.Persist=Topic '{0}' has been saved. +forum.msg.Topic.Update=Topic '{0}' has been updated. +forum.msg.Topic.Delete=Topic '{0}' has been deleted. + +forum.msg.Reply.Persist=Reply '{0}' has been saved. +forum.msg.Reply.Update=Reply '{0}' has been updated. +forum.msg.Reply.Delete=Reply '{0}' has been deleted. + Property changes on: trunk/examples/wiki/src/etc/i18n/messages_forum_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_jiraConnector_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_jiraConnector_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_jiraConnector_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_jiraConnector_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,5 @@ +jiraConnector.preferences.Name=Remote Connector: JIRA +jiraConnector.preferences.ConnectionTimeoutSeconds=Remote connection timeout in seconds +jiraConnector.preferences.ReplyTimeoutSeconds=Remote reply timeout in seconds +jiraConnector.preferences.IssueListCacheUpdateTimeoutSeconds=Issue list cache update timeout in seconds +jiraConnector.preferences.IssueListCacheIdleTimeoutSeconds=Issue list cache idle timeout in seconds Copied: trunk/examples/wiki/src/etc/i18n/messages_jiraIssueList_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_jiraIssueList_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_jiraIssueList_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_jiraIssueList_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,10 @@ +jiraIssueList.preferences.Name=Plugin: JIRA Issue List +jiraIssueList.preferences.Title=Title of isse list box +jiraIssueList.preferences.Url=URL of JIRA website +jiraIssueList.preferences.Username=JIRA XML-RPC remote username +jiraIssueList.preferences.Password=JIRA XML-RPC remote password +jiraIssueList.preferences.FilterId=ID of JIRA filter for remote request +jiraIssueList.preferences.NumberOfIssues=Number of issues shown in list +jiraIssueList.preferences.TruncateSummary=Truncate summary after characters + +jiraIssueList.label.NoIssuesFound=No issues found. Copied: trunk/examples/wiki/src/etc/i18n/messages_lastModifiedDocuments_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_lastModifiedDocuments_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_lastModifiedDocuments_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,6 @@ +lastModifiedDocuments.preferences.Name=Plugin: Last Modified Documents +lastModifiedDocuments.preferences.Title=Title of plugin box +lastModifiedDocuments.preferences.NumberOfItems=Number of items shown in list +lastModifiedDocuments.preferences.ShowUsernames=Show user names +lastModifiedDocuments.preferences.DocumentTitleLength=Truncate document titles after characters + Property changes on: trunk/examples/wiki/src/etc/i18n/messages_lastModifiedDocuments_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_tags_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_tags_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_tags_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_tags_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,5 @@ +tags.preferences.Name=Plugin: Tags +tags.preferences.LinkToCurrentDocument=Link to current (aggregator) document + +tags.label.Tags=Tags +tags.label.All=All... Property changes on: trunk/examples/wiki/src/etc/i18n/messages_tags_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/examples/wiki/src/etc/i18n/messages_userProfile_en.properties (from rev 7377, trunk/examples/wiki/src/etc/messages_userProfile_en.properties) =================================================================== --- trunk/examples/wiki/src/etc/i18n/messages_userProfile_en.properties (rev 0) +++ trunk/examples/wiki/src/etc/i18n/messages_userProfile_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1 @@ +userProfile.label.NoProfile=If you are #{currentDocument.createdBy.fullname}, please login and edit your profile. Property changes on: trunk/examples/wiki/src/etc/i18n/messages_userProfile_en.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/examples/wiki/src/etc/import-dev.sql =================================================================== Deleted: trunk/examples/wiki/src/etc/import-prod.sql =================================================================== --- trunk/examples/wiki/src/etc/import-prod.sql 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/import-prod.sql 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,141 +0,0 @@ --- MySQL magic! -set session sql_mode='PIPES_AS_CONCAT' - -INSERT INTO PREFERENCE VALUES(1,'Wiki','baseUrl',NULL,NULL,NULL,NULL,'http://www.lacewiki.org/change_me_in_database_import',0,NULL) -INSERT INTO PREFERENCE VALUES(2,'Wiki','timeZone',NULL,NULL,NULL,NULL,'CET',0,NULL) -INSERT INTO PREFERENCE VALUES(3,'Wiki','themeName',NULL,NULL,NULL,NULL,'default',0,NULL) -INSERT INTO PREFERENCE VALUES(4,'Wiki','memberArea',NULL,NULL,NULL,NULL,'Members',0,NULL) -INSERT INTO PREFERENCE VALUES(5,'Wiki','helpArea',NULL,NULL,NULL,NULL,'Help',0,NULL) -INSERT INTO PREFERENCE VALUES(6,'Wiki','defaultDocumentId',3,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(7,'Wiki','renderPermlinks',NULL,NULL,NULL,FALSE,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(8,'Wiki','permlinkSuffix',NULL,NULL,NULL,NULL,'.lace',0,NULL) -INSERT INTO PREFERENCE VALUES(9,'Wiki','feedTitlePrefix',NULL,NULL,NULL,NULL,'LaceWiki - ',0,NULL) -INSERT INTO PREFERENCE VALUES(10,'Wiki','purgeFeedEntriesAfterDays',999,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(11,'Wiki','atSymbolReplacement',NULL,NULL,NULL,NULL,'(AT)',0,NULL) -INSERT INTO PREFERENCE VALUES(12,'Wiki','mainMenuLevels',3,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(13,'Wiki','mainMenuDepth',2,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(14,'Wiki','mainMenuShowAdminOnly',NULL,NULL,NULL,FALSE,NULL,0,NULL) -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(19,'Wiki','showSiteFeedInMenu',NULL,NULL,NULL,TRUE,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(20,'Wiki','workspaceSwitcherDescriptionLength',25,NULL,NULL,NULL,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(50,'DocEditor','minorRevisionEnabled',NULL,NULL,NULL,TRUE,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(51,'DocEditor','regularEditAreaRows',15,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(52,'DocEditor','regularEditAreaColumns',65,NULL,NULL,NULL,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(60,'UserManagement','activationCodeSalt',NULL,NULL,NULL,NULL,'MySecretSalt123',0,NULL) -INSERT INTO PREFERENCE VALUES(61,'UserManagement','passwordRegex',NULL,NULL,NULL,NULL,'^[0-9A-Za-z]{6,15}',0,NULL) -INSERT INTO PREFERENCE VALUES(62,'UserManagement','newUserInRole',NULL,NULL,NULL,NULL,'member',0,NULL) -INSERT INTO PREFERENCE VALUES(63,'UserManagement','enableRegistration',NULL,NULL,NULL,TRUE,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(64,'UserManagement','createHomeAfterUserActivation',NULL,NULL,NULL,FALSE,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(65,'UserManagement','homepageDefaultContent',NULL,NULL,NULL,NULL,'This is your homepage, login to edit it.',0,NULL) - -INSERT INTO PREFERENCE VALUES(70,'Comments','listAscending',NULL,NULL,NULL,FALSE,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(71,'Comments','enableByDefault',NULL,NULL,NULL,TRUE,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(72,'Comments','threaded',NULL,NULL,NULL,TRUE,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(110,'LastModifiedDocuments','numberOfItems',5,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(111,'LastModifiedDocuments','showUsernames',NULL,NULL,NULL,TRUE,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(112,'LastModifiedDocuments','documentTitleLength',20,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(113,'LastModifiedDocuments','title',NULL,NULL,NULL,NULL,'Last Site Updates',0,NULL) - -INSERT INTO PREFERENCE VALUES(120,'Blog','pageSize',5,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(121,'Blog','archiveSubscribeIcon',NULL,NULL,NULL,FALSE,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(122,'Blog','recentEntriesItems',10,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(123,'Blog','recentEntriesTruncateTitle',40,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(124,'Blog','recentEntriesSubscribeIcon',NULL,NULL,NULL,TRUE,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(130,'FeedTeasers','title',NULL,NULL,NULL,NULL,'Site news feed',0,NULL) -INSERT INTO PREFERENCE VALUES(131,'FeedTeasers','numberOfTeasers',5,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(132,'FeedTeasers','truncateDescription',200,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(133,'FeedTeasers','showAuthor',NULL,NULL,NULL,TRUE,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(140,'Flash','allowedDomains',NULL,NULL,NULL,NULL,'video.google.com,www.youtube.com',0,NULL) - -INSERT INTO PREFERENCE VALUES(150,'DirMenu','title',NULL,NULL,NULL,NULL,'Directory Menu',0,NULL) -INSERT INTO PREFERENCE VALUES(151,'DirMenu','menuLevels',3,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(152,'DirMenu','menuDepth',3,NULL,NULL,NULL,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(160,'Tags','linkToCurrentDocument',NULL,NULL,NULL,TRUE,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(170,'DocPager','showNames',NULL,NULL,NULL,TRUE,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(180,'Forum','topicsPerPage',20,NULL,NULL,NULL,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(190,'JiraIssueList','title',NULL,NULL,NULL,NULL,'JIRA Issues',0,NULL) -INSERT INTO PREFERENCE VALUES(191,'JiraIssueList','truncateSummary',35,NULL,NULL,NULL,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(200,'FeedAggregator','title',NULL,NULL,NULL,NULL,'Aggregated Feeds',0,NULL) -INSERT INTO PREFERENCE VALUES(201,'FeedAggregator','truncateDescription',100,NULL,NULL,NULL,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(210,'ForumTopPosters','title',NULL,NULL,NULL,NULL,'Top Forum Posters',0,NULL) -INSERT INTO PREFERENCE VALUES(211,'ForumTopPosters','numberOfPosters',10,NULL,NULL,NULL,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(300,'JiraConnector','connectionTimeoutSeconds',15,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(301,'JiraConnector','replyTimeoutSeconds',10,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(302,'JiraConnector','issueListCacheUpdateTimeoutSeconds',600,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(303,'JiraConnector','issueListCacheIdleTimeoutSeconds',36000,NULL,NULL,NULL,NULL,0,NULL) - -INSERT INTO PREFERENCE VALUES(310,'FeedConnector','connectionTimeoutSeconds',30,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(311,'FeedConnector','feedCacheUpdateTimeoutSeconds',600,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO PREFERENCE VALUES(312,'FeedConnector','feedCacheIdleTimeoutSeconds',36000,NULL,NULL,NULL,NULL,0,NULL) - -INSERT INTO `ROLES` (`ROLE_ID`, `ACCESS_LEVEL`, `CREATED_ON`, `DISPLAY_NAME`, `NAME`, `OBJ_VERSION`) VALUES (1,1000,'2006-06-27 13:45:00','Administrator','admin',0) -INSERT INTO `ROLES` (`ROLE_ID`, `ACCESS_LEVEL`, `CREATED_ON`, `DISPLAY_NAME`, `NAME`, `OBJ_VERSION`) VALUES (2,0,'2006-06-27 13:45:00','Guest','guest',0) -INSERT INTO `ROLES` (`ROLE_ID`, `ACCESS_LEVEL`, `CREATED_ON`, `DISPLAY_NAME`, `NAME`, `OBJ_VERSION`) VALUES (3,1,'2006-06-27 13:45:00','Member','member',0) - -INSERT INTO `USER_PROFILE` (`USER_PROFILE_ID`, `BIO`, `CREATED_ON`, `IMAGE_DATA`, `IMAGE_CONTENT_TYPE`, `LOCATION`, `OCCUPATION`, `SIGNATURE`, `OBJ_VERSION`, `WEBSITE`) VALUES (1,NULL,'2006-06-27 13:45:00',NULL,NULL,NULL,NULL,NULL,0,NULL) -INSERT INTO `USER_PROFILE` (`USER_PROFILE_ID`, `BIO`, `CREATED_ON`, `IMAGE_DATA`, `IMAGE_CONTENT_TYPE`, `LOCATION`, `OCCUPATION`, `SIGNATURE`, `OBJ_VERSION`, `WEBSITE`) VALUES (2,NULL,'2006-06-27 13:45:00',NULL,NULL,NULL,NULL,NULL,0,NULL) - -INSERT INTO `USERS` (`USER_ID`, `ACTIVATED`, `ACTIVATION_CODE`, `CREATED_ON`, `EMAIL`, `FIRSTNAME`, `LAST_LOGIN_ON`, `LASTNAME`, `PASSWORDHASH`, `USERNAME`, `OBJ_VERSION`, `USER_PROFILE_ID`, `MEMBER_HOME_WIKI_DIRECTORY_ID`) VALUES (1,'',NULL,'2006-06-27 13:45:00','admin(a)email.tld','System',NULL,'Administrator','21232f297a57a5a743894a0e4a801fc3','admin',0,1,NULL) -INSERT INTO `USERS` (`USER_ID`, `ACTIVATED`, `ACTIVATION_CODE`, `CREATED_ON`, `EMAIL`, `FIRSTNAME`, `LAST_LOGIN_ON`, `LASTNAME`, `PASSWORDHASH`, `USERNAME`, `OBJ_VERSION`, `USER_PROFILE_ID`, `MEMBER_HOME_WIKI_DIRECTORY_ID`) VALUES (2,false,NULL,'2006-06-27 13:45:00','guest','Anonymous',NULL,'Guest','guest','guest',0,2,NULL) - -INSERT INTO `USER_ROLE` (`USER_ID`, `ROLE_ID`) VALUES (1,1) -INSERT INTO `USER_ROLE` (`USER_ID`, `ROLE_ID`) VALUES (2,2) - - -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (1,1,'2006-09-23 13:45:00',NULL,'ROOT',0,0,'ROOT',1000,'',1,NULL,NULL,0) - -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (2,2,'2006-09-23 13:45:00',NULL,'Start',0,0,'Start',0,false,1,NULL,1,0) - -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES(3,2,'2006-09-23 13:45:00',NULL,'Welcome!',0,1,'Welcome',0,false,1,NULL,2,0) - -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES(4,4,'2006-09-23 13:45:00',NULL,'Members',0,0,'Members',1000,'',1,NULL,1,0) - -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (5,5,'2006-09-23 13:45:00',NULL,'Help',0,0,'Help',1000,'',1,NULL,1,0) - -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (6,5,'2006-09-23 13:45:00',NULL,'Working with documents',0,0,'WorkingWithDocuments',1000,'',1,NULL,5,0) - -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (7,5,'2006-09-23 13:45:00',NULL,'Wiki Text Markup',0,0,'WikiTextMarkup',1000,'',1,NULL,6,0) - -INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (8,8,'2006-09-23 13:45:00',NULL,'Trash',0,0,'Trash',1000,'',1,NULL,1,0) - -INSERT INTO `WIKI_FILE` (`NODE_ID`, `FILE_REVISION`) VALUES (3,0) -INSERT INTO `WIKI_FILE` (`NODE_ID`, `FILE_REVISION`) VALUES (7,0) - -INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (1,'Root Area',1,12,1,NULL) -INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (2,'Start Area',2,3,1,3) -INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (4,'Default member area',8,9,1,NULL) -INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (5,'Help documents',4,7,1,NULL) -INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (6,'Creating and editing wiki documents',5,6,1,NULL) -INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (8,'Trash Area',10,11,1,NULL) - -INSERT INTO `WIKI_DOCUMENT` (`NODE_ID`, `CONTENT`, `CONTENT_MACROS`, `ENABLE_COMMENT_FORM`, `ENABLE_COMMENTS`, `ENABLE_COMMENTS_ON_FEEDS`, `FOOTER`, `FOOTER_MACROS`, `HEADER`, `HEADER_MACROS`, `NAME_AS_TITLE`) VALUES (3,'Welcome to LaceWiki.\n\nLogin with admin-admin and rebuild the search index in the administration area.',NULL,true,true,true,NULL,NULL,NULL,NULL,true) - -INSERT INTO `WIKI_DOCUMENT` (`NODE_ID`, `CONTENT`, `CONTENT_MACROS`, `ENABLE_COMMENT_FORM`, `ENABLE_COMMENTS`, `ENABLE_COMMENTS_ON_FEEDS`, `FOOTER`, `FOOTER_MACROS`, `HEADER`, `HEADER_MACROS`, `NAME_AS_TITLE`) VALUES (7,'Most content on this website (blogs, blog comments, wiki pages, user profiles) is rendered using the [Seam Text=>http://docs.jboss.com/seam/latest/reference/en/html/text.html] engine. If you are creating content, it helps to know a few simple tricks.\n\n++ Basic formatting\n\nYou can emphasize words using *emphasis*, _underline_, ~strikeout~ or ^superscript^.\n\n`You can emphasize words using\n*emphasis*, _underline_, ~strikeout~ or ^superscript^.`\n\nBut if you really want to type a special character such as \\* or \\+, you need to escape it with a \\\\.\n\n`But if you really want to type a special character\nsuch as \\* or \\+, you need to escape it with a \\\\.`\n\nAlternatively, you can use special characters freely inside |monospace text|.\n\n`Alternat! ively, you can use special characters freely\ninside |monospace text|.`\n\n++ Block formatting\n\nOf course, you can also use \"inline quotes\".\n\n\"And block quotes.\"\n\nAnd split text across several paragraphs.\n\n`Of course, you can also use \"inline quotes\".\n\n\"And block quotes.\"\n\nAnd split text across several paragraphs.`\n\nYou can create\n\n= unorderedlists\n= of stuff\n= like this\n\nor\n\n# numbered lists\n# of other things\n\n`You can create\n= unordered lists\n= of stuff\n= like this\n\nor\n\n# numbered lists\n# of other things`\n\n++ Code Blocks\n\nA third option for embedding text that uses special characters is to use a code block, delimited by `backticks`. For example:\n\n<pre>\\`for (int i\\=0; i\\<100; i\\+\\+) {\n log.info(\\\"Hello world!\\\");\n}\\`</pre>\n\n+ Here is a first-level heading\n\nHere is a normal paragraph.\n\n++ Here is a second-level heading\n\nAnd another paragraph.\n\n`+ Here is a first-level heading\n\nHere is a normal paragra! ph.\n\n++ Here is a second-level heading\n\nAnd another paragraph.`\n\ n++ Links\n\nThe wiki has powerful handling for links.\n\nHTML links to [=>http://hibernate.org] or attach the link to [some link text=>http://hibernate.org].\nMy [e-mail address=>mailto:foo@bar.tld] will be automatically protected.\n\n`HTML links to [=>http://hibernate.org] or attach the\nlink to [some link text=>http://hibernate.org].\nMy [e-mail address=>mailto:foo@bar.tld] will be\nautomatically protected.`\n\nInternal wiki links simply use area and document/file names:\n\n= Link to another document: \\[\\=\\>My Document\\] \n= Link to another document with link text: \\[A document\\=\\>My Document\\]\n= Link to another document in another area: \\[\\=\\>Another Area\\|My Document\\]\n= Link to an uploaded file or image: \\[\\=\\>My Upload\\]\n\nYou can even link to a [Hibernate JIRA issue=>hhh://2702], or a\n[Seam JIRA issue=>jbseam://1920].\n\n`You can even link to a [Hibernate JIRA issue=>hhh://2702],\nor a [Seam JIRA issue=>jbseam://1920].`\n\n++ Embedded HTML\n\nYo! u can even use many HTML tags directly, but not tags that would create a security vulnerability!\n\n`You can even use many HTML tags directly,\nbut not tags that would create a\nsecurity vulnerability!`',NULL,false,false,false,NULL,NULL,NULL,NULL,true) - -INSERT INTO `WIKI_MENU_ITEM` (`DIRECTORY_ID`, `DISPLAY_POSITION`) VALUES (2,0) -INSERT INTO `WIKI_MENU_ITEM` (`DIRECTORY_ID`, `DISPLAY_POSITION`) VALUES (4,1) -INSERT INTO `WIKI_MENU_ITEM` (`DIRECTORY_ID`, `DISPLAY_POSITION`) VALUES (5,2) - -INSERT INTO `FEED` (`FEED_ID`, `FEED_TYPE`, `FEED_LINK`, `AUTHOR`, `DESCRIPTION`, `PUBLISHED_ON`, `TITLE`, `DIRECTORY_ID`) VALUES (1,'INTERNAL','http://www.lacewiki.org/change_me_in_database_import/ROOT','System Administrator',NULL,'2006-09-23 13:45:00','ROOT',1); - -INSERT INTO `LINK_PROTOCOL` (`LINK_PROTOCOL_ID`, `LINK`, `PREFIX`, `OBJ_VERSION`) VALUES (1,'http://jira.jboss.com/jira/browse/JBSEAM-[[link]]','jbseam',0) -INSERT INTO `LINK_PROTOCOL` (`LINK_PROTOCOL_ID`, `LINK`, `PREFIX`, `OBJ_VERSION`) VALUES (2,'http://opensource.atlassian.com/projects/hibernate/browse/HHH-[[link]]','hhh',0) -INSERT INTO `LINK_PROTOCOL` (`LINK_PROTOCOL_ID`, `LINK`, `PREFIX`, `OBJ_VERSION`) VALUES (3,'http://www.youtube.com/watch?v=[[link]]','youtube',0) - --- More MySQL magic! -set session sql_mode='' Deleted: trunk/examples/wiki/src/etc/messages_blogArchive_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_blogArchive_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_blogArchive_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,3 +0,0 @@ -blogArchive.label.Archive=Archive -blogArchive.label.Subscribe=Subscribe -blogArchive.label.AllEntries=All Entries \ No newline at end of file Deleted: trunk/examples/wiki/src/etc/messages_blogDirectory_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_blogDirectory_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_blogDirectory_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,18 +0,0 @@ -blog.preferences.Name=Plugin: Blog -blog.preferences.PageSize=Number of blog entries per page -blog.preferences.ArchiveSubscribeIcon=Show feed subscribe icon on archive -blog.preferences.RecentEntriesItems=Number of recent entries shown -blog.preferences.RecentEntriesTruncateTitle=Truncate recent entries title after characters -blog.preferences.RecentEntriesSubscribeIcon=Show feed subscribe icon on recent entries - -blogDirectory.label.Attachment=attachment -blogDirectory.label.Attachments=attachments -blogDirectory.label.Showing=Showing -blogDirectory.label.To=to -blogDirectory.label.Of=of -blogDirectory.label.BlogEntries=blog entries -blogDirectory.label.In=in -blogDirectory.label.Tagged=tagged -blogDirectory.label.NoBlogEntriesFound=No blog entries found. -blogDirectory.label.Tag=Tag -blogDirectory.label.Tags=Tags \ No newline at end of file Deleted: trunk/examples/wiki/src/etc/messages_blogRecentEntries_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_blogRecentEntries_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_blogRecentEntries_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,3 +0,0 @@ -blogRecentEntries.label.RecentEntries=Recent Entries -blogRecentEntries.label.Subscribe=Subscribe - Deleted: trunk/examples/wiki/src/etc/messages_dirMenu_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_dirMenu_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_dirMenu_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,9 +0,0 @@ -dirMenu.preferences.Name=Plugin: Directory Menu - -dirMenu.preferences.Title=Default menu title -dirMenu.preferences.MenuLevels=Flatten display of menu tree to levels -dirMenu.preferences.MenuDepth=Maximum depth of menu items -dirMenu.preferences.ShowSubscribeIcon=Show 'Subscribe' icon -dirMenu.preferences.OnlyMenuItems=Display only menu items - -dirMenu.label.Subscribe=Subscribe Deleted: trunk/examples/wiki/src/etc/messages_docPager_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_docPager_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_docPager_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,3 +0,0 @@ -docPager.preferences.Name=Plugin: Doc Pager -docPager.preferences.ByProperty=Property used to search previous/next doc -docPager.preferences.ShowNames=Show names of previous/next document Deleted: trunk/examples/wiki/src/etc/messages_faqBrowser_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_faqBrowser_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_faqBrowser_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,20 +0,0 @@ -faqBrowser.label.Category=FAQ Category -faqBrowser.label.Question=Question -faqBrowser.label.Updated=Updated -faqBrowser.label.NoQuestionsInCategory=No questions in this category. -faqBrowser.button.NewQuestion=New Question -faqBrowser.button.NewQuestion.accesskey=Q - -faqBrowser.label.NewFaqQuestion=New question in category -faqBrowser.label.NewQuestionTitle=Your question? -faqBrowser.label.QuestionTitle=Question -faqBrowser.label.QuestionText=Text -faqBrowser.button.SaveNoKey=Save -faqBrowser.button.CancelNoKey=Cancel - -faqBrowser.msg.Question.Persist=Question '{0}' has been saved. -faqBrowser.msg.Question.Update=Question '{0}' has been updated. -faqBrowser.msg.Question.Delete=Question '{0}' has been deleted. - -faqBrowser.msg.TreeNotFound=Could not find FAQ tree, please create a default document with [<=faqBrowser] header! -faqBrowser.msg.TreeEmpty=No FAQ categories found, create subdirectories in the current directory. \ No newline at end of file Deleted: trunk/examples/wiki/src/etc/messages_feedAggregator_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_feedAggregator_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_feedAggregator_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,16 +0,0 @@ -feedAggregator.preferences.Name=Plugin: Feed Aggregator -feedAggregator.preferences.Title=Title of aggregator box -feedAggregator.preferences.Urls=URLs of feeds to aggregate, space separated -feedAggregator.preferences.NumberOfFeedEntries=Number of feed entries -feedAggregator.preferences.TruncateDescription=Truncate description text after characters -feedAggregator.preferences.HideDate=Hide date display -feedAggregator.preferences.HideAuthor=Hide author display -feedAggregator.preferences.HideFeedInfo=Hide link to feed -feedAggregator.preferences.HideDescription=Hide feed entry text -feedAggregator.preferences.HideTitle=Hide feed entry title -feedAggregator.preferences.AggregateId=Identifier for aggregate (enables subscription) - -feedAggregator.label.More=more... -feedAggregator.label.By=by -feedAggregator.label.Subscribe=Subscribe -feedAggregator.label.NoEntriesFound=No feed entries found. \ No newline at end of file Deleted: trunk/examples/wiki/src/etc/messages_feedConnector_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_feedConnector_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_feedConnector_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,4 +0,0 @@ -feedConnector.preferences.Name=Remote Connector: Feeds -feedConnector.preferences.ConnectionTimeoutSeconds=Remote connection timeout in seconds (TODO:currently not used!) -feedConnector.preferences.FeedCacheUpdateTimeoutSeconds=Feed cache update timeout in seconds -feedConnector.preferences.FeedCacheIdleTimeoutSeconds=Feed cache idle timeout in seconds Deleted: trunk/examples/wiki/src/etc/messages_feedTeasers_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_feedTeasers_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_feedTeasers_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,9 +0,0 @@ -feedTeasers.preferences.Name=Plugin: Feed Teasers -feedTeasers.preferences.Title=Title of teaser box -feedTeasers.preferences.Feed=Feed -feedTeasers.preferences.NumberOfTeasers=Number of feed entries -feedTeasers.preferences.TruncateDescription=Truncate teaser text after characters -feedTeasers.preferences.ShowAuthor=Show author name - -feedTeasers.label.More=more... -feedTeasers.label.By=by Deleted: trunk/examples/wiki/src/etc/messages_flash_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_flash_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_flash_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,8 +0,0 @@ -flash.preferences.Name=Plugin: Flash -flash.preferences.FlashURL=URL of flash movie -flash.preferences.Width=Width in pixels -flash.preferences.Height=Height in pixels -flash.preferences.AllowedDomains=Comma-separated list of allowed domain names - -flash.msg.URLNotSupplied=[Flash Macro: Add 'url' macro parameter to embed flash movie.] -flash.msg.URLNotAllowed=[Flash Macro: The flash URL you supplied is not in the list of valid domains, please ask the system administrator to add it.] Deleted: trunk/examples/wiki/src/etc/messages_forumTopPosters_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_forumTopPosters_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_forumTopPosters_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,12 +0,0 @@ -forumTopPosters.preferences.Name=Plugin: Forum Top Posters -forumTopPosters.preferences.Title=Title of box -forumTopPosters.preferences.NumberOfPosters=Number of posters in list -forumTopPosters.preferences.ForumLink=Wiki link to forum start page (topic list) -forumTopPosters.preferences.ExcludeRoles=Exclude users with role name (space separated) - -forumTopPosters.label.Position=Position -forumTopPosters.label.User=User -forumTopPosters.label.JoinedOn=Joined On -forumTopPosters.label.RatingPoints=Rating Points - -forumTopPosters.label.NoPostersFound=No posters with rating points found. Deleted: trunk/examples/wiki/src/etc/messages_forum_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_forum_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_forum_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,102 +0,0 @@ -forum.preferences.Name=Plugin: Forum -forum.preferences.TopicsPerPage=Number of topics per page -forum.preferences.NotifyMeOfReplies=Enable e-mail reply notification switch by default - -forum.label.Showing=Showing -forum.label.To=to -forum.label.Of=of -forum.label.Topics=topics -forum.label.Joined=Joined On - -forum.label.Forum=Forum -forum.label.TopicCount=Topics -forum.label.PostCount=Posts -forum.label.NewestTopic=Newest Topic -forum.label.LatestPost=Last Post -forum.label.Feed=Feed -forum.label.EnableFeed=Enable syndication feed (disabling invalidates subcriber link) - -forum.label.EditForum=Edit Forum -forum.label.NewForum=New Forum - -forum.label.NewTopic=New Topic -forum.label.Subject=Subject -forum.label.Message=Message -forum.label.Options=Options -forum.label.OpenTopicAllowReplies=Open topic, allow replies -forum.label.StickyPosting=Sticky posting -forum.label.NotifyMeOfReplies=Notify me via e-mail of any replies - -forum.label.Reply=Reply -forum.label.NewReply=New Reply -forum.label.Replies=Replies - -forum.label.ForumName=Forum Name -forum.label.ForumDescription=Description - -forum.msg.NoForumsFound=No forums found. - -forum.button.NewForum=New Forum -forum.button.NewForum.accesskey=N -forum.button.ManageForums=Manage Forums -forum.button.ManageForums.accesskey=G - -forum.button.Edit=Edit -forum.button.ResetFeed=Clear Feed -forum.button.MoveUp=Move Up -forum.button.MoveDown=Move Down -forum.button.SaveNoKey=Save -forum.button.Save=Save -forum.button.Save.accesskey=S -forum.button.Update=Update -forum.button.Update.accesskey=U -forum.button.Remove=Delete -forum.button.Remove.accesskey=Delete -forum.button.CancelNoKey=Cancel -forum.button.Cancel=Cancel -forum.button.Cancel.accesskey=C -forum.button.Exit=Exit -forum.button.Exit.accesskey=E -forum.button.NewTopic=New Topic -forum.button.NewTopic.accesskey=N -forum.button.ForumList=Forum List -forum.button.ForumList.accesskey=O -forum.button.TopicList=Topic List -forum.button.TopicList.accesskey=T -forum.button.Reply=Reply -forum.button.Reply.accesskey=E -forum.button.Reply.nokey=Reply -forum.button.Quote=Quote -forum.button.Quote.accesskey=Q -forum.button.Quote.nokey=Quote -forum.button.RemoveReply=Remove -forum.button.PreviousPosting=Previous -forum.button.PreviousPosting.accesskey=V -forum.button.NextPosting=Next -forum.button.NextPosting.accesskey=N - -forum.label.replyForm.Name=Name -forum.label.replyForm.Email=E-mail address (optional) -forum.label.replyForm.Homepage=Homepage URL (optional) -forum.label.replyForm.Subject=Subject -forum.label.replyForm.Message=Message - -forum.label.WroteOn=wrote on -forum.label.reply.FeedEntryTitlePrefix=Re: - -forum.msg.Feed.Create=Created syndication feed for this forum. -forum.msg.Feed.Remove=Removed syndication feed of this forum. -forum.msg.Feed.Reset=Queued removal of all feed entries from the syndication feed of this directory, please update to finalize. - -forum.msg.Forum.Persist=Forum '{0}' has been saved. -forum.msg.Forum.Update=Forum '{0}' has been updated. -forum.msg.Forum.Delete=Forum '{0}' has been deleted. - -forum.msg.Topic.Persist=Topic '{0}' has been saved. -forum.msg.Topic.Update=Topic '{0}' has been updated. -forum.msg.Topic.Delete=Topic '{0}' has been deleted. - -forum.msg.Reply.Persist=Reply '{0}' has been saved. -forum.msg.Reply.Update=Reply '{0}' has been updated. -forum.msg.Reply.Delete=Reply '{0}' has been deleted. - Deleted: trunk/examples/wiki/src/etc/messages_jiraConnector_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_jiraConnector_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_jiraConnector_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,5 +0,0 @@ -jiraConnector.preferences.Name=Remote Connector: JIRA -jiraConnector.preferences.ConnectionTimeoutSeconds=Remote connection timeout in seconds -jiraConnector.preferences.ReplyTimeoutSeconds=Remote reply timeout in seconds -jiraConnector.preferences.IssueListCacheUpdateTimeoutSeconds=Issue list cache update timeout in seconds -jiraConnector.preferences.IssueListCacheIdleTimeoutSeconds=Issue list cache idle timeout in seconds Deleted: trunk/examples/wiki/src/etc/messages_jiraIssueList_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_jiraIssueList_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_jiraIssueList_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,10 +0,0 @@ -jiraIssueList.preferences.Name=Plugin: JIRA Issue List -jiraIssueList.preferences.Title=Title of isse list box -jiraIssueList.preferences.Url=URL of JIRA website -jiraIssueList.preferences.Username=JIRA XML-RPC remote username -jiraIssueList.preferences.Password=JIRA XML-RPC remote password -jiraIssueList.preferences.FilterId=ID of JIRA filter for remote request -jiraIssueList.preferences.NumberOfIssues=Number of issues shown in list -jiraIssueList.preferences.TruncateSummary=Truncate summary after characters - -jiraIssueList.label.NoIssuesFound=No issues found. Deleted: trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_lastModifiedDocuments_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,6 +0,0 @@ -lastModifiedDocuments.preferences.Name=Plugin: Last Modified Documents -lastModifiedDocuments.preferences.Title=Title of plugin box -lastModifiedDocuments.preferences.NumberOfItems=Number of items shown in list -lastModifiedDocuments.preferences.ShowUsernames=Show user names -lastModifiedDocuments.preferences.DocumentTitleLength=Truncate document titles after characters - Deleted: trunk/examples/wiki/src/etc/messages_tags_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_tags_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_tags_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,5 +0,0 @@ -tags.preferences.Name=Plugin: Tags -tags.preferences.LinkToCurrentDocument=Link to current (aggregator) document - -tags.label.Tags=Tags -tags.label.All=All... Deleted: trunk/examples/wiki/src/etc/messages_userProfile_en.properties =================================================================== --- trunk/examples/wiki/src/etc/messages_userProfile_en.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/messages_userProfile_en.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1 +0,0 @@ -userProfile.label.NoProfile=If you are #{currentDocument.createdBy.fullname}, please login and edit your profile. Copied: trunk/examples/wiki/src/etc/production.sql (from rev 7377, trunk/examples/wiki/src/etc/import-prod.sql) =================================================================== --- trunk/examples/wiki/src/etc/production.sql (rev 0) +++ trunk/examples/wiki/src/etc/production.sql 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,135 @@ +INSERT INTO PREFERENCE VALUES(1,'Wiki','baseUrl',NULL,NULL,NULL,NULL,'http://www.lacewiki.org/change_me_in_database_import',0,NULL); +INSERT INTO PREFERENCE VALUES(2,'Wiki','timeZone',NULL,NULL,NULL,NULL,'CET',0,NULL); +INSERT INTO PREFERENCE VALUES(3,'Wiki','themeName',NULL,NULL,NULL,NULL,'default',0,NULL); +INSERT INTO PREFERENCE VALUES(4,'Wiki','memberArea',NULL,NULL,NULL,NULL,'Members',0,NULL); +INSERT INTO PREFERENCE VALUES(5,'Wiki','helpArea',NULL,NULL,NULL,NULL,'Help',0,NULL); +INSERT INTO PREFERENCE VALUES(6,'Wiki','defaultDocumentId',3,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(7,'Wiki','renderPermlinks',NULL,NULL,NULL,FALSE,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(8,'Wiki','permlinkSuffix',NULL,NULL,NULL,NULL,'.lace',0,NULL); +INSERT INTO PREFERENCE VALUES(9,'Wiki','feedTitlePrefix',NULL,NULL,NULL,NULL,'LaceWiki - ',0,NULL); +INSERT INTO PREFERENCE VALUES(10,'Wiki','purgeFeedEntriesAfterDays',999,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(11,'Wiki','atSymbolReplacement',NULL,NULL,NULL,NULL,'(AT)',0,NULL); +INSERT INTO PREFERENCE VALUES(12,'Wiki','mainMenuLevels',3,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(13,'Wiki','mainMenuDepth',2,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(14,'Wiki','mainMenuShowAdminOnly',NULL,NULL,NULL,FALSE,NULL,0,NULL); +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(19,'Wiki','showSiteFeedInMenu',NULL,NULL,NULL,TRUE,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(20,'Wiki','workspaceSwitcherDescriptionLength',25,NULL,NULL,NULL,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(50,'DocEditor','minorRevisionEnabled',NULL,NULL,NULL,TRUE,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(51,'DocEditor','regularEditAreaRows',15,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(52,'DocEditor','regularEditAreaColumns',65,NULL,NULL,NULL,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(60,'UserManagement','activationCodeSalt',NULL,NULL,NULL,NULL,'MySecretSalt123',0,NULL); +INSERT INTO PREFERENCE VALUES(61,'UserManagement','passwordRegex',NULL,NULL,NULL,NULL,'^[0-9A-Za-z]{6,15}',0,NULL); +INSERT INTO PREFERENCE VALUES(62,'UserManagement','newUserInRole',NULL,NULL,NULL,NULL,'member',0,NULL); +INSERT INTO PREFERENCE VALUES(63,'UserManagement','enableRegistration',NULL,NULL,NULL,TRUE,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(64,'UserManagement','createHomeAfterUserActivation',NULL,NULL,NULL,FALSE,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(65,'UserManagement','homepageDefaultContent',NULL,NULL,NULL,NULL,'This is your homepage, login to edit it.',0,NULL); + +INSERT INTO PREFERENCE VALUES(70,'Comments','listAscending',NULL,NULL,NULL,FALSE,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(71,'Comments','enableByDefault',NULL,NULL,NULL,TRUE,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(72,'Comments','threaded',NULL,NULL,NULL,TRUE,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(110,'LastModifiedDocuments','numberOfItems',5,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(111,'LastModifiedDocuments','showUsernames',NULL,NULL,NULL,TRUE,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(112,'LastModifiedDocuments','documentTitleLength',20,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(113,'LastModifiedDocuments','title',NULL,NULL,NULL,NULL,'Last Site Updates',0,NULL); + +INSERT INTO PREFERENCE VALUES(120,'Blog','pageSize',5,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(121,'Blog','archiveSubscribeIcon',NULL,NULL,NULL,FALSE,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(122,'Blog','recentEntriesItems',10,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(123,'Blog','recentEntriesTruncateTitle',40,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(124,'Blog','recentEntriesSubscribeIcon',NULL,NULL,NULL,TRUE,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(130,'FeedTeasers','title',NULL,NULL,NULL,NULL,'Site news feed',0,NULL); +INSERT INTO PREFERENCE VALUES(131,'FeedTeasers','numberOfTeasers',5,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(132,'FeedTeasers','truncateDescription',200,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(133,'FeedTeasers','showAuthor',NULL,NULL,NULL,TRUE,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(140,'Flash','allowedDomains',NULL,NULL,NULL,NULL,'video.google.com,www.youtube.com',0,NULL); + +INSERT INTO PREFERENCE VALUES(150,'DirMenu','title',NULL,NULL,NULL,NULL,'Directory Menu',0,NULL); +INSERT INTO PREFERENCE VALUES(151,'DirMenu','menuLevels',3,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(152,'DirMenu','menuDepth',3,NULL,NULL,NULL,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(160,'Tags','linkToCurrentDocument',NULL,NULL,NULL,TRUE,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(170,'DocPager','showNames',NULL,NULL,NULL,TRUE,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(180,'Forum','topicsPerPage',20,NULL,NULL,NULL,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(190,'JiraIssueList','title',NULL,NULL,NULL,NULL,'JIRA Issues',0,NULL); +INSERT INTO PREFERENCE VALUES(191,'JiraIssueList','truncateSummary',35,NULL,NULL,NULL,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(200,'FeedAggregator','title',NULL,NULL,NULL,NULL,'Aggregated Feeds',0,NULL); +INSERT INTO PREFERENCE VALUES(201,'FeedAggregator','truncateDescription',100,NULL,NULL,NULL,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(210,'ForumTopPosters','title',NULL,NULL,NULL,NULL,'Top Forum Posters',0,NULL); +INSERT INTO PREFERENCE VALUES(211,'ForumTopPosters','numberOfPosters',10,NULL,NULL,NULL,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(300,'JiraConnector','connectionTimeoutSeconds',15,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(301,'JiraConnector','replyTimeoutSeconds',10,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(302,'JiraConnector','issueListCacheUpdateTimeoutSeconds',600,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(303,'JiraConnector','issueListCacheIdleTimeoutSeconds',36000,NULL,NULL,NULL,NULL,0,NULL); + +INSERT INTO PREFERENCE VALUES(310,'FeedConnector','connectionTimeoutSeconds',30,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(311,'FeedConnector','feedCacheUpdateTimeoutSeconds',600,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO PREFERENCE VALUES(312,'FeedConnector','feedCacheIdleTimeoutSeconds',36000,NULL,NULL,NULL,NULL,0,NULL); + +INSERT INTO `ROLES` (`ROLE_ID`, `ACCESS_LEVEL`, `CREATED_ON`, `DISPLAY_NAME`, `NAME`, `OBJ_VERSION`) VALUES (1,1000,'2006-06-27 13:45:00','Administrator','admin',0); +INSERT INTO `ROLES` (`ROLE_ID`, `ACCESS_LEVEL`, `CREATED_ON`, `DISPLAY_NAME`, `NAME`, `OBJ_VERSION`) VALUES (2,0,'2006-06-27 13:45:00','Guest','guest',0); +INSERT INTO `ROLES` (`ROLE_ID`, `ACCESS_LEVEL`, `CREATED_ON`, `DISPLAY_NAME`, `NAME`, `OBJ_VERSION`) VALUES (3,1,'2006-06-27 13:45:00','Member','member',0); + +INSERT INTO `USER_PROFILE` (`USER_PROFILE_ID`, `BIO`, `CREATED_ON`, `IMAGE_DATA`, `IMAGE_CONTENT_TYPE`, `LOCATION`, `OCCUPATION`, `SIGNATURE`, `OBJ_VERSION`, `WEBSITE`) VALUES (1,NULL,'2006-06-27 13:45:00',NULL,NULL,NULL,NULL,NULL,0,NULL); +INSERT INTO `USER_PROFILE` (`USER_PROFILE_ID`, `BIO`, `CREATED_ON`, `IMAGE_DATA`, `IMAGE_CONTENT_TYPE`, `LOCATION`, `OCCUPATION`, `SIGNATURE`, `OBJ_VERSION`, `WEBSITE`) VALUES (2,NULL,'2006-06-27 13:45:00',NULL,NULL,NULL,NULL,NULL,0,NULL); + +INSERT INTO `USERS` (`USER_ID`, `ACTIVATED`, `ACTIVATION_CODE`, `CREATED_ON`, `EMAIL`, `FIRSTNAME`, `LAST_LOGIN_ON`, `LASTNAME`, `PASSWORDHASH`, `USERNAME`, `OBJ_VERSION`, `USER_PROFILE_ID`, `MEMBER_HOME_WIKI_DIRECTORY_ID`) VALUES (1,'',NULL,'2006-06-27 13:45:00','admin(a)email.tld','System',NULL,'Administrator','21232f297a57a5a743894a0e4a801fc3','admin',0,1,NULL); +INSERT INTO `USERS` (`USER_ID`, `ACTIVATED`, `ACTIVATION_CODE`, `CREATED_ON`, `EMAIL`, `FIRSTNAME`, `LAST_LOGIN_ON`, `LASTNAME`, `PASSWORDHASH`, `USERNAME`, `OBJ_VERSION`, `USER_PROFILE_ID`, `MEMBER_HOME_WIKI_DIRECTORY_ID`) VALUES (2,false,NULL,'2006-06-27 13:45:00','guest','Anonymous',NULL,'Guest','guest','guest',0,2,NULL); + +INSERT INTO `USER_ROLE` (`USER_ID`, `ROLE_ID`) VALUES (1,1); +INSERT INTO `USER_ROLE` (`USER_ID`, `ROLE_ID`) VALUES (2,2); + + +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (1,1,'2006-09-23 13:45:00',NULL,'ROOT',0,0,'ROOT',1000,'',1,NULL,NULL,0); + +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (2,2,'2006-09-23 13:45:00',NULL,'Start',0,0,'Start',0,false,1,NULL,1,0); + +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES(3,2,'2006-09-23 13:45:00',NULL,'Welcome!',0,1,'Welcome',0,false,1,NULL,2,0); + +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES(4,4,'2006-09-23 13:45:00',NULL,'Members',0,0,'Members',1000,'',1,NULL,1,0); + +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (5,5,'2006-09-23 13:45:00',NULL,'Help',0,0,'Help',1000,'',1,NULL,1,0); + +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (6,5,'2006-09-23 13:45:00',NULL,'Working with documents',0,0,'WorkingWithDocuments',1000,'',1,NULL,5,0); + +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (7,5,'2006-09-23 13:45:00',NULL,'Wiki Text Markup',0,0,'WikiTextMarkup',1000,'',1,NULL,6,0); + +INSERT INTO `WIKI_NODE` (`NODE_ID`, `AREA_NR`, `CREATED_ON`, `LAST_MODIFIED_ON`, `NAME`, `READ_ACCESS_LEVEL`, `OBJ_VERSION`, `WIKINAME`, `WRITE_ACCESS_LEVEL`, `WRITE_PROTECTED`, `CREATED_BY_USER_ID`, `LAST_MODIFIED_BY_USER_ID`, `PARENT_NODE_ID`, `RATING`) VALUES (8,8,'2006-09-23 13:45:00',NULL,'Trash',0,0,'Trash',1000,'',1,NULL,1,0); + +INSERT INTO `WIKI_FILE` (`NODE_ID`, `FILE_REVISION`) VALUES (3,0); +INSERT INTO `WIKI_FILE` (`NODE_ID`, `FILE_REVISION`) VALUES (7,0); + +INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (1,'Root Area',1,12,1,NULL); +INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (2,'Start Area',2,3,1,3); +INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (4,'Default member area',8,9,1,NULL); +INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (5,'Help documents',4,7,1,NULL); +INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (6,'Creating and editing wiki documents',5,6,1,NULL); +INSERT INTO `WIKI_DIRECTORY` (`NODE_ID`, `DESCRIPTION`, `NS_LEFT`, `NS_RIGHT`, `NS_THREAD`, `DEFAULT_FILE_ID`) VALUES (8,'Trash Area',10,11,1,NULL); + +INSERT INTO `WIKI_DOCUMENT` (`NODE_ID`, `CONTENT`, `CONTENT_MACROS`, `ENABLE_COMMENT_FORM`, `ENABLE_COMMENTS`, `ENABLE_COMMENTS_ON_FEEDS`, `FOOTER`, `FOOTER_MACROS`, `HEADER`, `HEADER_MACROS`, `NAME_AS_TITLE`) VALUES (3,'Welcome to LaceWiki.\n\nLogin with admin-admin and rebuild the search index in the administration area.',NULL,true,true,true,NULL,NULL,NULL,NULL,true); + +INSERT INTO `WIKI_DOCUMENT` (`NODE_ID`, `CONTENT`, `CONTENT_MACROS`, `ENABLE_COMMENT_FORM`, `ENABLE_COMMENTS`, `ENABLE_COMMENTS_ON_FEEDS`, `FOOTER`, `FOOTER_MACROS`, `HEADER`, `HEADER_MACROS`, `NAME_AS_TITLE`) VALUES (7,'Most content on this website (blogs, blog comments, wiki pages, user profiles) is rendered using the [Seam Text=>http://docs.jboss.com/seam/latest/reference/en/html/text.html] engine. If you are creating content, it helps to know a few simple tricks.\n\n++ Basic formatting\n\nYou can emphasize words using *emphasis*, _underline_, ~strikeout~ or ^superscript^.\n\n`You can emphasize words using\n*emphasis*, _underline_, ~strikeout~ or ^superscript^.`\n\nBut if you really want to type a special character such as \\* or \\+, you need to escape it with a \\\\.\n\n`But if you really want to type a special character\nsuch as \\* or \\+, you need to escape it with a \\\\.`\n\nAlternatively, you can use special characters freely inside |monospace text|.\n\n`Alternat! ively, you can use special characters freely\ninside |monospace text|.`\n\n++ Block formatting\n\nOf course, you can also use \"inline quotes\".\n\n\"And block quotes.\"\n\nAnd split text across several paragraphs.\n\n`Of course, you can also use \"inline quotes\".\n\n\"And block quotes.\"\n\nAnd split text across several paragraphs.`\n\nYou can create\n\n= unorderedlists\n= of stuff\n= like this\n\nor\n\n# numbered lists\n# of other things\n\n`You can create\n= unordered lists\n= of stuff\n= like this\n\nor\n\n# numbered lists\n# of other things`\n\n++ Code Blocks\n\nA third option for embedding text that uses special characters is to use a code block, delimited by `backticks`. For example:\n\n<pre>\\`for (int i\\=0; i\\<100; i\\+\\+) {\n log.info(\\\"Hello world!\\\");\n}\\`</pre>\n\n+ Here is a first-level heading\n\nHere is a normal paragraph.\n\n++ Here is a second-level heading\n\nAnd another paragraph.\n\n`+ Here is a first-level heading\n\nHere is a normal paragra! ph.\n\n++ Here is a second-level heading\n\nAnd another paragraph.`\n\ n++ Links\n\nThe wiki has powerful handling for links.\n\nHTML links to [=>http://hibernate.org] or attach the link to [some link text=>http://hibernate.org].\nMy [e-mail address=>mailto:foo@bar.tld] will be automatically protected.\n\n`HTML links to [=>http://hibernate.org] or attach the\nlink to [some link text=>http://hibernate.org].\nMy [e-mail address=>mailto:foo@bar.tld] will be\nautomatically protected.`\n\nInternal wiki links simply use area and document/file names:\n\n= Link to another document: \\[\\=\\>My Document\\] \n= Link to another document with link text: \\[A document\\=\\>My Document\\]\n= Link to another document in another area: \\[\\=\\>Another Area\\|My Document\\]\n= Link to an uploaded file or image: \\[\\=\\>My Upload\\]\n\nYou can even link to a [Hibernate JIRA issue=>hhh://2702], or a\n[Seam JIRA issue=>jbseam://1920].\n\n`You can even link to a [Hibernate JIRA issue=>hhh://2702],\nor a [Seam JIRA issue=>jbseam://1920].`\n\n++ Embedded HTML\n\nYo! u can even use many HTML tags directly, but not tags that would create a security vulnerability!\n\n`You can even use many HTML tags directly,\nbut not tags that would create a\nsecurity vulnerability!`',NULL,false,false,false,NULL,NULL,NULL,NULL,true); + +INSERT INTO `WIKI_MENU_ITEM` (`DIRECTORY_ID`, `DISPLAY_POSITION`) VALUES (2,0); +INSERT INTO `WIKI_MENU_ITEM` (`DIRECTORY_ID`, `DISPLAY_POSITION`) VALUES (4,1); +INSERT INTO `WIKI_MENU_ITEM` (`DIRECTORY_ID`, `DISPLAY_POSITION`) VALUES (5,2); + +INSERT INTO `FEED` (`FEED_ID`, `FEED_TYPE`, `FEED_LINK`, `AUTHOR`, `DESCRIPTION`, `PUBLISHED_ON`, `TITLE`, `DIRECTORY_ID`) VALUES (1,'INTERNAL','http://www.lacewiki.org/change_me_in_database_import/ROOT','System Administrator',NULL,'2006-09-23 13:45:00','ROOT',1);; + +INSERT INTO `LINK_PROTOCOL` (`LINK_PROTOCOL_ID`, `LINK`, `PREFIX`, `OBJ_VERSION`) VALUES (1,'http://jira.jboss.com/jira/browse/JBSEAM-[[link]]','jbseam',0); +INSERT INTO `LINK_PROTOCOL` (`LINK_PROTOCOL_ID`, `LINK`, `PREFIX`, `OBJ_VERSION`) VALUES (2,'http://opensource.atlassian.com/projects/hibernate/browse/HHH-[[link]]','hhh',0); +INSERT INTO `LINK_PROTOCOL` (`LINK_PROTOCOL_ID`, `LINK`, `PREFIX`, `OBJ_VERSION`) VALUES (3,'http://www.youtube.com/watch?v=[[link]]','youtube',0); Property changes on: trunk/examples/wiki/src/etc/production.sql ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/examples/wiki/src/etc/security.drl =================================================================== --- trunk/examples/wiki/src/etc/security.drl 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/etc/security.drl 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,82 +0,0 @@ -/** - TODO: THIS IS CURRENTLY NOT USED! - - We are not using entity security. The problem with entity security is that UPDATEs might - happen even if a guest just renders a document (Wiki links are resolved). So we'd need quite - complex rules to really restrict access on an entity level. Easy way out is to just restrict - the @Create method access of the manager components and the persist(), update(), and insert() - operations for any further checks after a manager component was created. -*/ - -package Permissions; - -import java.security.Principal; - -import org.jboss.seam.security.PermissionCheck; - -import org.jboss.seam.wiki.core.model.Node; -import org.jboss.seam.wiki.core.model.Document; -import org.jboss.seam.wiki.core.model.Directory; -import org.jboss.seam.wiki.core.model.File; -import org.jboss.seam.wiki.core.model.User; -import org.jboss.seam.wiki.core.model.Role; - -/** - User either needs to have the access level of the parent directory - or the user is the creator of the parent directory -*/ -rule RestrictNodeCreateAccess - no-loop; - activation-group "permissions" -when - c: PermissionCheck(name == "Node", action == "create"); - Directory(dirWriteAcccessLevel : writeAccessLevel, dirCreator : createdBy) - - Role(userAccessLevel : accessLevel -> (userAccessLevel.intValue() >= dirWriteAcccessLevel.intValue()) ) - or - User(authenticatedUserId : id -> (dirCreator.getId().equals(authenticatedUserId)) ) -then - c.grant(); - modify(c); -end; - -/** - User either needs to have the access level of the edited node or has to be the creator -*/ -rule RestrictNodeEditAccess - no-loop; - activation-group "permissions" -when - c: PermissionCheck(name == "Node", action == "edit"); - - Node(nodeWriteAccessLevel : writeAccessLevel, nodeCreator : createdBy) - - Role(userAccessLevel : accessLevel -> (userAccessLevel.intValue() >= nodeWriteAccessLevel.intValue()) ) - or - User(authenticatedUserId : id -> (nodeCreator.getId().equals(authenticatedUserId)) ) - -then - c.grant(); - modify(c); -end; - -/** - User can't persist or update a node and assign a higher access level than he has, unless he is the creator -*/ -rule RestrictRaiseAccessLevel - no-loop; - activation-group "permissions" -when - c: PermissionCheck(name == "Node", action == "changeAccessLevel"); - - Node(desiredWriteAccessLevel : writeAccessLevel, desiredReadAccessLevel : readAccessLevel, nodeCreator : createdBy) -/* TODO: Drools is broken, http://jira.jboss.com/jira/browse/JBSEAM-1020 */ - Role(userAccessLevel : accessLevel -> (desiredReadAccessLevel.intValue() <= userAccessLevel.intValue() && desiredWriteAccessLevel.intValue() <= userAccessLevel.intValue()) ) - or - User(authenticatedUserId : id -> (nodeCreator == null || nodeCreator.getId().equals(authenticatedUserId)) ) - -then - c.grant(); - modify(c); -end; - Deleted: trunk/examples/wiki/src/etc/wiki.skin.properties =================================================================== Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/WikiInit.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/WikiInit.java 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/WikiInit.java 2008-02-06 10:00:05 UTC (rev 7379) @@ -32,6 +32,7 @@ @Logger static Log log; + private String appname; private String adminContact; private boolean debug; @@ -42,7 +43,7 @@ @Observer("org.jboss.seam.postInitialization") public void initWiki() throws Exception { - log.info("Starting LaceWiki..."); + log.info("Starting LaceWiki for application '"+appname+"'..."); if (dbunitImporter != null) { log.info("Importing development test data"); @@ -52,9 +53,9 @@ //System.out.println(listJNDITree("java:")); log.info("registering Hibernate statistics MBean"); - hibernateMBeanName = new ObjectName("Hibernate:type=statistics,application=laceWiki"); + hibernateMBeanName = new ObjectName("Hibernate:type=statistics,application="+appname); StatisticsService mBean = new StatisticsService(); - mBean.setSessionFactoryJNDIName("SessionFactories/laceWikiSF"); + mBean.setSessionFactoryJNDIName("SessionFactories/"+appname+"SF"); ManagementFactory.getPlatformMBeanServer().registerMBean(mBean, hibernateMBeanName); Events.instance().raiseEvent("Wiki.started"); @@ -70,6 +71,14 @@ ManagementFactory.getPlatformMBeanServer().unregisterMBean(hibernateMBeanName); } + public String getAppname() { + return appname; + } + + public void setAppname(String appname) { + this.appname = appname; + } + public String getAdminContact() { return adminContact; } Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java 2008-02-06 10:00:05 UTC (rev 7379) @@ -89,7 +89,7 @@ } public void setRequestedUsername(String requestedUsername) { - getLog().debug("######################## REQUESTED: " + requestedUsername); + getLog().debug("requested user name: " + requestedUsername); this.requestedUsername = requestedUsername; } @@ -127,8 +127,8 @@ @Override protected User loadInstance() { if (getRequestedUsername() != null && getRequestedUsername().length() >0) { - getLog().debug("################ FINDING USER: " + getRequestedUsername()); - return userDAO.findUser(getRequestedUsername(), true, true); + getLog().debug("loading user from database: " + getRequestedUsername()); + return userDAO.findUser(getRequestedUsername(), false, true); } else { return getEntityManager().find(getEntityClass(), getId()); } Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java 2008-02-06 10:00:05 UTC (rev 7379) @@ -239,12 +239,11 @@ throw new RuntimeException(ex); } - /* TODO: This breaks stuff... // If the user is not logged in, we might as well destroy the session immediately, saving some memory - if (!Identity.instance().isLoggedIn()) { + if (request.getSession().isNew() && !Identity.instance().isLoggedIn()) { + log.debug("destroying session that was only created for reading the feed"); Session.instance().invalidate(); } - */ } public SyndFeed createSyndFeed(String baseURI, SyndFeedType syndFeedType, Feed feed, Integer currentAccessLevel) { Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FileServlet.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FileServlet.java 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FileServlet.java 2008-02-06 10:00:05 UTC (rev 7379) @@ -123,12 +123,11 @@ response.getOutputStream().flush(); } - /* TODO: This breaks stuff... + // If the user is not logged in, we might as well destroy the session immediately, saving some memory - if (!Identity.instance().isLoggedIn()) { + if (request.getSession().isNew() && !Identity.instance().isLoggedIn()) { Session.instance().invalidate(); } - */ } } Deleted: trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumTopic.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumTopic.java 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/plugin/forum/ForumTopic.java 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,136 +0,0 @@ -package org.jboss.seam.wiki.plugin.forum; - -import org.jboss.seam.wiki.core.search.annotations.Searchable; -import org.jboss.seam.wiki.util.WikiUtil; - -import javax.persistence.*; - -/** - * Represents a forum topic (a particular thread of discussion). - * - * We re-use the <tt>Document</tt> class and extend the node hierarchy further with - * a new discriminator, <tt>FORUMTOPIC</tt>. In addition to normal document properties, - * a forum topic has a few transient properties (sticky, unread, last comment, etc.) and - * a few methods to handle macros that must appear before and after the topic - * content (e.g. hideControls, hideCreatorHistory, forumReplies). - * - * Although pragmatic, I'm not sure we'll handle macros that way (with string concatenation) - * in the future. This should be made more generic and typesafe, I think we need macro metadata - * - which really depends on how plugin metadata will be designed. - * - * @author Christian Bauer - */ -/* -@Entity -@DiscriminatorValue("FORUMTOPIC") -(a)org.hibernate.search.annotations.Indexed -@Searchable(description = "Forum Topics") -*/ -public class ForumTopic { -/* - @Transient - protected final String[] MACROS_BEFORE_CONTENT = - {"clearBackground", "forumPosting"}; - @Transient - protected final String[] MACROS_AFTER_CONTENT = - {"forumReplies", "hideControls", "hideComments", "hideTags", "hideCreatorHistory"}; - - @Transient - private long numOfComments; - @Transient - private boolean sticky; - @Transient - private boolean unread; - @Transient - private Comment lastComment; - - public ForumTopic() { - super("New Topic"); - setContentWithoutMacros("Edit this *wiki* text, the preview will update automatically."); - setNameAsTitle(false); - setEnableComments(true); - setEnableCommentForm(true); - setEnableCommentsOnFeeds(true); - } - - public static ForumTopic fromArray(Object[] propertyValues) { - ForumTopic topic = (ForumTopic)propertyValues[0]; - topic.setNumOfComments(propertyValues[1] != null ? (Long)propertyValues[1] : 0); - topic.setSticky(propertyValues[2] != null ? ((Integer) propertyValues[2] != 0) : false); - topic.setLastComment(propertyValues[3] != null ? (Comment)propertyValues[3] : null); - return topic; - } - - public long getNumOfComments() { - return numOfComments; - } - - public void setNumOfComments(long numOfComments) { - this.numOfComments = numOfComments; - } - - public boolean isSticky() { - return sticky; - } - - public void setSticky(boolean sticky) { - this.sticky = sticky; - } - - public boolean isUnread() { - return unread; - } - - public void setUnread(boolean unread) { - this.unread = unread; - } - - public Comment getLastComment() { - return lastComment; - } - - public void setLastComment(Comment lastComment) { - this.lastComment = lastComment; - } - - public String getContentWithoutMacros() { - String content = getContent(); - // Cut from first double newline to last double newline - return content.substring( content.indexOf("\n\n")+2, content.lastIndexOf("\n\n") ); - } - - public void setContentWithoutMacros(String content) { - // First, remove any macros that the user might have put into the text - content = WikiUtil.removeMacros(content); - - // Apply the macros before and after content, separated with double newlines - StringBuilder contentWithMacros = new StringBuilder(); - for (String s : MACROS_BEFORE_CONTENT) contentWithMacros.append("[<=").append(s).append("]\n"); - contentWithMacros.append("\n").append(content).append("\n\n"); - for (String s : MACROS_AFTER_CONTENT) contentWithMacros.append("[<=").append(s).append("]\n"); - if (isSticky()) contentWithMacros.append("[<=forumStickyPosting]").append("]\n"); - setContent(contentWithMacros.toString()); - } - - public void setDefaultMacros() { - StringBuilder macros = new StringBuilder(); - for (String s : MACROS_BEFORE_CONTENT) macros.append(s).append(" "); - for (String s : MACROS_AFTER_CONTENT) macros.append(s).append(" "); - if (isSticky()) macros.append("forumStickyPosting").append(" "); - setMacros(macros.substring(0, macros.length()-1)); - } - - public String getIconName() { - StringBuilder iconName = new StringBuilder(); - iconName.append("posting"); - if (isSticky()) { - iconName.append("_sticky"); - } else if (!getEnableCommentForm()) { - iconName.append("_locked"); - } - if (isUnread()) iconName.append("_unread"); - - return iconName.toString(); - } -*/ -} Deleted: trunk/examples/wiki/src/main/seam.properties =================================================================== Deleted: trunk/examples/wiki/src/test/components.properties =================================================================== --- trunk/examples/wiki/src/test/components.properties 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/test/components.properties 2008-02-06 10:00:05 UTC (rev 7379) @@ -1,3 +0,0 @@ -ejbTransaction true -seamStartsPersistenceUnit false -jndiPattern #{ejbName}/local \ No newline at end of file Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml =================================================================== --- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-02-06 10:00:05 UTC (rev 7379) @@ -69,7 +69,7 @@ <PREFERENCE PREF_ID = "180" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Forum" PROPERTY_NAME = "topicsPerPage" STRING_VALUE = "[NULL]" LONG_VALUE = "20" BOOLEAN_VALUE = "[NULL]"/> <PREFERENCE PREF_ID = "190" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "JiraIssueList" PROPERTY_NAME = "title" STRING_VALUE = "JIRA Issues" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> - <PREFERENCE PREF_ID = "191" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "JiraIssueList" PROPERTY_NAME = "truncateSummary" STRING_VALUE = "[NULL]" LONG_VALUE = "35" BOOLEAN_VALUE = "[NULL]"/> + <PREFERENCE PREF_ID = "191" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "JiraIssueList" PROPERTY_NAME = "truncateSummary" STRING_VALUE = "[NULL]" LONG_VALUE = "80" BOOLEAN_VALUE = "[NULL]"/> <PREFERENCE PREF_ID = "200" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "FeedAggregator" PROPERTY_NAME = "title" STRING_VALUE = "Aggregated Feeds" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/> <PREFERENCE PREF_ID = "201" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "FeedAggregator" PROPERTY_NAME = "truncateDescription" STRING_VALUE = "[NULL]" LONG_VALUE = "100" BOOLEAN_VALUE = "[NULL]"/> @@ -267,7 +267,7 @@ <WIKI_FILE NODE_ID="8" FILE_REVISION="0"/> <WIKI_DOCUMENT - NODE_ID="8" CONTENT="Testdocument Three

<div class="homepageNews">
[<=feedAggregator[truncateDescription=250][numberOfFeedEntries=10][aggregateId=My Aggregated Feed][urls=http://rss.slashdot.org/Slashdot/slashdot http://feeds.engadget.com/weblogsinc/engadget]]
</div>
" + NODE_ID="8" CONTENT="Testdocument Three

<div class="homepageBox">
[<=feedAggregator[truncateDescription=250][numberOfFeedEntries=10][aggregateId=My Aggregated Feed][urls=http://rss.slashdot.org/Slashdot/slashdot http://feeds.engadget.com/weblogsinc/engadget]]
</div>
" HEADER="[NULL]" FOOTER="[NULL]" HEADER_MACROS="[NULL]" CONTENT_MACROS="feedAggregator" FOOTER_MACROS="[NULL]" NAME_AS_TITLE="true" ENABLE_COMMENTS="true" ENABLE_COMMENT_FORM="true" ENABLE_COMMENTS_ON_FEEDS="true"/> Modified: trunk/examples/wiki/view/dirDisplay_d.xhtml =================================================================== --- trunk/examples/wiki/view/dirDisplay_d.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/dirDisplay_d.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -71,7 +71,7 @@ <h:outputLink value="#{wiki:renderFeedURL(directoryHome.instance.feed, null, null)}" styleClass="linkNavigation" rendered="#{not empty directoryHome.instance.feed}"> - <h:graphicImage styleClass="feedIcon" value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.gif" width="18" height="18"/> + <h:graphicImage styleClass="feedIcon" value="#{themePath}/img/icon.atom.gif" width="18" height="18"/> <h:outputText value="#{messages['lacewiki.button.DirectoryFeed']}"/> </h:outputLink> @@ -132,7 +132,7 @@ <s:fragment> <h:panelGroup rendered="#{directoryHome.instance.id == trashArea.id and s:hasPermission('Trash', 'empty', directoryHome.instance)}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.trash.gif" + <h:graphicImage value="#{themePath}/img/icon.trash.gif" width="18" height="20" style="vertical-align:middle;"/> <h:commandLink action="#{directoryHome.emptyTrash()}" tabindex="1" styleClass="button"> @@ -222,7 +222,7 @@ rendered="#{!empty directoryHome.parentNode and s:hasPermission('Node','read',directoryHome.parentNode)}"> <f:param name="directoryId" value="#{directoryHome.parentNode.id}"/> <h:panelGrid columns="2"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dirup.gif" width="18" height="20"/> + <h:graphicImage value="#{themePath}/img/icon.dirup.gif" width="18" height="20"/> <h:outputText value=".."/> </h:panelGrid> </s:link> @@ -241,18 +241,18 @@ rendered="#{directoryHome.pager.previousPageAvailable}"> <f:param name="page" value="0"/> <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.first.gif" width="13" height="11"/> </s:link> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!directoryHome.pager.previousPageAvailable}"/> <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" propagation="none" rendered="#{directoryHome.pager.previousPageAvailable}"> <f:param name="page" value="#{directoryHome.pager.previousPage}"/> <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.previous.gif" width="13" height="11"/> </s:link> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!directoryHome.pager.previousPageAvailable}"/> <s:span> @@ -266,18 +266,18 @@ rendered="#{directoryHome.pager.nextPageAvailable}"> <f:param name="page" value="#{directoryHome.pager.nextPage}"/> <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.next.gif" width="13" height="11"/> </s:link> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!directoryHome.pager.nextPageAvailable}"/> <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" propagation="none" rendered="#{directoryHome.pager.nextPageAvailable}"> <f:param name="page" value="#{directoryHome.pager.lastPage}"/> <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.last.gif" width="13" height="11"/> </s:link> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!directoryHome.pager.nextPageAvailable}"/> </h:panelGrid> @@ -308,7 +308,7 @@ <h:outputText value="-" rendered="#{node.isInstance('WikiDirectory')}"/> </s:fragment> <s:fragment rendered="#{clipboard.isCut(node.id)}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.cut.gif" width="18" height="20"/> + <h:graphicImage value="#{themePath}/img/icon.cut.gif" width="18" height="20"/> </s:fragment> </h:column> <h:column> @@ -316,34 +316,34 @@ <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" accesskey="." propagation="none" rendered="#{!empty directoryHome.parentNode and s:hasPermission('Node','read',directoryHome.parentNode)}"> <f:param name="directoryId" value="#{directoryHome.parentNode.id}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dirup.gif" width="18" height="20"/> + <h:graphicImage value="#{themePath}/img/icon.dirup.gif" width="18" height="20"/> </s:link> </f:facet> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dir.gif" + <h:graphicImage value="#{themePath}/img/icon.dir.gif" width="18" height="20" rendered="#{node.isInstance('WikiDirectory') and node.id != trashArea.id and node.id != memberArea.id and node.id != helpArea.id}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.trash.gif" + <h:graphicImage value="#{themePath}/img/icon.trash.gif" width="18" height="20" rendered="#{node.isInstance('WikiDirectory') and node.id == trashArea.id}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.user.gif" + <h:graphicImage value="#{themePath}/img/icon.user.gif" width="18" height="20" rendered="#{node.isInstance('WikiDirectory') and node.id == memberArea.id}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.help.gif" + <h:graphicImage value="#{themePath}/img/icon.help.gif" width="18" height="20" rendered="#{node.isInstance('WikiDirectory') and node.id == helpArea.id}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.doc.gif" + <h:graphicImage value="#{themePath}/img/icon.doc.gif" width="18" height="20" rendered="#{node.isInstance('WikiDocument') and node.id != directoryHome.instance.defaultFile.id}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.doc.default.gif" + <h:graphicImage value="#{themePath}/img/icon.doc.default.gif" width="18" height="20" rendered="#{node.isInstance('WikiDocument') and node.id == directoryHome.instance.defaultFile.id}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes[node.contentType].displayIcon}" + <h:graphicImage value="#{themePath}/img/#{uploadTypes[node.contentType].displayIcon}" width="18" height="20" rendered="#{node.isInstance('WikiUpload') and !empty uploadTypes[node.contentType]}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes['generic'].displayIcon}" + <h:graphicImage value="#{themePath}/img/#{uploadTypes['generic'].displayIcon}" width="18" height="20" rendered="#{node.isInstance('WikiUpload') and empty uploadTypes[node.contentType]}"/> </h:column> @@ -568,18 +568,18 @@ rendered="#{directoryHome.pager.previousPageAvailable}"> <f:param name="page" value="0"/> <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.first.gif" width="13" height="11"/> </s:link> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!directoryHome.pager.previousPageAvailable}"/> <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" propagation="none" rendered="#{directoryHome.pager.previousPageAvailable}"> <f:param name="page" value="#{directoryHome.pager.previousPage}"/> <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.previous.gif" width="13" height="11"/> </s:link> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!directoryHome.pager.previousPageAvailable}"/> <s:span> @@ -593,18 +593,18 @@ rendered="#{directoryHome.pager.nextPageAvailable}"> <f:param name="page" value="#{directoryHome.pager.nextPage}"/> <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.next.gif" width="13" height="11"/> </s:link> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!directoryHome.pager.nextPageAvailable}"/> <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" propagation="none" rendered="#{directoryHome.pager.nextPageAvailable}"> <f:param name="page" value="#{directoryHome.pager.lastPage}"/> <f:param name="pageSize" value="#{directoryHome.pager.pageSize}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.last.gif" width="13" height="11"/> </s:link> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!directoryHome.pager.nextPageAvailable}"/> </h:panelGrid> Modified: trunk/examples/wiki/view/dirDisplay_m.xhtml =================================================================== --- trunk/examples/wiki/view/dirDisplay_m.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/dirDisplay_m.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -103,7 +103,7 @@ rendered="#{!empty directoryHome.parentNode and s:hasPermission('Node','read',directoryHome.parentNode)}"> <f:param name="directoryId" value="#{directoryHome.parentNode.id}"/> <h:panelGrid columns="2"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dirup.gif" width="18" height="20"/> + <h:graphicImage value="#{themePath}/img/icon.dirup.gif" width="18" height="20"/> <h:outputText value=".."/> </h:panelGrid> </s:link> @@ -128,23 +128,23 @@ <s:link view="/dirDisplay_#{skin}.xhtml" tabindex="1" accesskey="." propagation="none" rendered="#{!empty directoryHome.parentNode and s:hasPermission('Node','read',directoryHome.parentNode)}"> <f:param name="directoryId" value="#{directoryHome.parentNode.id}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dirup.gif" width="18" height="20"/> + <h:graphicImage value="#{themePath}/img/icon.dirup.gif" width="18" height="20"/> </s:link> </f:facet> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dir.gif" + <h:graphicImage value="#{themePath}/img/icon.dir.gif" width="18" height="20" rendered="#{node.isInstance('WikiDirectory')}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.doc.gif" + <h:graphicImage value="#{themePath}/img/icon.doc.gif" width="18" height="20" rendered="#{node.isInstance('WikiDocument') and node != directoryHome.instance.defaultFile}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.doc.default.gif" + <h:graphicImage value="#{themePath}/img/icon.doc.default.gif" width="18" height="20" rendered="#{node.isInstance('WikiDocument') and node == directoryHome.instance.defaultFile}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes[node.contentType].displayIcon}" + <h:graphicImage value="#{themePath}/img/#{uploadTypes[node.contentType].displayIcon}" width="18" height="20" rendered="#{node.isInstance('WikiUpload') and !empty uploadTypes[node.contentType]}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes['generic'].displayIcon}" + <h:graphicImage value="#{themePath}/img/#{uploadTypes['generic'].displayIcon}" width="18" height="20" rendered="#{node.isInstance('WikiUpload') and empty uploadTypes[node.contentType]}"/> </h:column> Modified: trunk/examples/wiki/view/dirEdit_d.xhtml =================================================================== --- trunk/examples/wiki/view/dirEdit_d.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/dirEdit_d.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -152,7 +152,7 @@ <h:column> <a:outputPanel> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dir.gif" width="18" height="20"/> + <h:graphicImage value="#{themePath}/img/icon.dir.gif" width="18" height="20"/> </a:outputPanel> </h:column> @@ -179,7 +179,7 @@ oncomplete="onAjaxRequestComplete()" styleClass="sessionEventTrigger" tabindex="1" reRender="menuEditor"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/up.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/up.gif" width="18" height="18"/> </a:commandLink> </h:column> <h:column> @@ -189,7 +189,7 @@ oncomplete="onAjaxRequestComplete()" styleClass="sessionEventTrigger" tabindex="1" reRender="menuEditor"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/down.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/down.gif" width="18" height="18"/> </a:commandLink> </h:column> Modified: trunk/examples/wiki/view/docDisplay_m.xhtml =================================================================== --- trunk/examples/wiki/view/docDisplay_m.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/docDisplay_m.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -156,9 +156,9 @@ <h:panelGrid columns="3"> <s:span><a name="attachment#{uiComponent['attachmentTable'].rowIndex + 1}"/></s:span> <h:outputText value="# #{uiComponent['attachmentTable'].rowIndex + 1}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes[link.file.contentType].displayIcon}" + <h:graphicImage value="#{themePath}/img/#{uploadTypes[link.file.contentType].displayIcon}" rendered="#{not empty uploadTypes[link.file.contentType]}" width="18" height="20"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes['generic'].displayIcon}" + <h:graphicImage value="#{themePath}/img/#{uploadTypes['generic'].displayIcon}" rendered="#{empty uploadTypes[link.file.contentType]}" width="18" height="20"/> </h:panelGrid> </h:column> Modified: trunk/examples/wiki/view/includes/attachmentDisplay.xhtml =================================================================== --- trunk/examples/wiki/view/includes/attachmentDisplay.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/includes/attachmentDisplay.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -21,10 +21,10 @@ <s:span><a name="attachment#{uiComponent['attachmentTable'].rowIndex + 1}"/></s:span> <h:outputText value="# #{uiComponent['attachmentTable'].rowIndex + 1}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes[link.file.contentType].displayIcon}" + <h:graphicImage value="#{themePath}/img/#{uploadTypes[link.file.contentType].displayIcon}" rendered="#{not empty uploadTypes[link.file.contentType]}" width="18" height="20"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes['generic'].displayIcon}" + <h:graphicImage value="#{themePath}/img/#{uploadTypes['generic'].displayIcon}" rendered="#{empty uploadTypes[link.file.contentType]}" width="18" height="20"/> </h:panelGrid> </h:column> Modified: trunk/examples/wiki/view/includes/captchaEntry.xhtml =================================================================== --- trunk/examples/wiki/view/includes/captchaEntry.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/includes/captchaEntry.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -3,7 +3,6 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:a="https://ajax4jsf.dev.java.net/ajax" xmlns:s="http://jboss.com/products/seam/taglib"> <s:div styleClass="entry #{invalid?'errorEntry':''}"> @@ -11,7 +10,7 @@ <s:div styleClass="errorMessage" rendered="#{invalid}"> <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif" + <h:graphicImage value="#{themePath}/img/attention.gif" width="18" height="18" styleClass="attentionImage"/> <s:span styleClass="attentionMessage"> <s:message/></s:span> Modified: trunk/examples/wiki/view/includes/formFieldDecorate.xhtml =================================================================== --- trunk/examples/wiki/view/includes/formFieldDecorate.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/includes/formFieldDecorate.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -21,7 +21,7 @@ <s:div styleClass="errorMessage" rendered="#{invalid}"> <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif" + <h:graphicImage value="#{themePath}/img/attention.gif" width="18" height="18" styleClass="attentionImage"/> <s:span styleClass="attentionMessage"> <s:message/></s:span> Modified: trunk/examples/wiki/view/includes/ownerSelector.xhtml =================================================================== --- trunk/examples/wiki/view/includes/ownerSelector.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/includes/ownerSelector.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -74,17 +74,17 @@ <a:commandLink action="#{userSearch.firstPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="20" oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()" reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.first.gif" width="13" height="11"/> </a:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!userSearch.previousPageAvailable}"/> <a:commandLink action="#{userSearch.previousPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="20" oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()" reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.previous.gif" width="13" height="11"/> </a:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!userSearch.previousPageAvailable}"/> <h:outputText value="#{messages['lacewiki.label.userList.Found']} #{userSearch.rowCount} #{messages['lacewiki.label.userList.Members']}"/> @@ -92,17 +92,17 @@ <a:commandLink action="#{userSearch.nextPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="20" oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()" reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.next.gif" width="13" height="11"/> </a:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!userSearch.nextPageAvailable}"/> <a:commandLink action="#{userSearch.lastPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="20" oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()" reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.last.gif" width="13" height="11"/> </a:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!userSearch.nextPageAvailable}"/> </h:panelGrid> @@ -127,9 +127,9 @@ <a:commandLink action="#{userSearch.sortBy('username')}" tabindex="20" reRender="dialogOwnerSelectionContent" oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()" styleClass="sessionEventTrigger"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.up.gif" width="8" height="8" rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.down.gif" width="8" height="8" rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/> <h:outputText value="#{messages['lacewiki.label.userList.Username']}"/> </a:commandLink> @@ -143,9 +143,9 @@ <a:commandLink action="#{userSearch.sortBy('firstname')}" tabindex="20" reRender="dialogOwnerSelectionContent" oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()" styleClass="sessionEventTrigger"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.up.gif" width="8" height="8" rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.down.gif" width="8" height="8" rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/> <h:outputText value="#{messages['lacewiki.label.userList.FirstName']}"/> </a:commandLink> @@ -158,9 +158,9 @@ <a:commandLink action="#{userSearch.sortBy('lastname')}" tabindex="20" reRender="dialogOwnerSelectionContent" oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()" styleClass="sessionEventTrigger"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.up.gif" width="8" height="8" rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.down.gif" width="8" height="8" rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/> <h:outputText value="#{messages['lacewiki.label.userList.LastName']}"/> </a:commandLink> @@ -173,9 +173,9 @@ <a:commandLink action="#{userSearch.sortBy('email')}" tabindex="20" reRender="dialogOwnerSelectionContent" oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()" styleClass="sessionEventTrigger"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.up.gif" width="8" height="8" rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.down.gif" width="8" height="8" rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/> <h:outputText value="#{messages['lacewiki.label.userList.Email']}"/> </a:commandLink> Modified: trunk/examples/wiki/view/includes/pluginPreferencesForm.xhtml =================================================================== --- trunk/examples/wiki/view/includes/pluginPreferencesForm.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/includes/pluginPreferencesForm.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -64,7 +64,7 @@ </h:inputText> <s:selectDate for="dt" dateFormat="dd. MMM yyyy, HH:mm"> <h:graphicImage style="vertical-align:bottom;margin-bottom:2px;" - value="/themes/#{preferences.get('Wiki').themeName}/img/icon.calendar.gif" width="16" + value="#{themePath}/img/icon.calendar.gif" width="16" height="16"/> </s:selectDate> </s:div> Modified: trunk/examples/wiki/view/includes/preferences/editor.xhtml =================================================================== --- trunk/examples/wiki/view/includes/preferences/editor.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/includes/preferences/editor.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -41,7 +41,7 @@ </h:inputText> <s:selectDate for="dt" dateFormat="dd. MMM yyyy, HH:mm"> <h:graphicImage style="vertical-align:bottom;margin-bottom:2px;" - value="/themes/#{preferences.get('Wiki').themeName}/img/icon.calendar.gif" + value="#{themePath}/img/icon.calendar.gif" width="16" height="16"/> </s:selectDate> </s:div> Modified: trunk/examples/wiki/view/includes/statusIndicator.xhtml =================================================================== --- trunk/examples/wiki/view/includes/statusIndicator.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/includes/statusIndicator.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -10,12 +10,12 @@ <a:status id="#{statusId}" forceId="true"> <f:facet name="start"> <s:div styleClass="statusStart"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/statusindicator.gif" width="20" height="25"/> + <h:graphicImage value="#{themePath}/img/statusindicator.gif" width="20" height="25"/> </s:div> </f:facet> <f:facet name="stop"> <s:div styleClass="statusStop"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="20" height="25"/> + <h:graphicImage value="#{themePath}/img/blank.gif" width="20" height="25"/> </s:div> </f:facet> </a:status> Modified: trunk/examples/wiki/view/includes/userControl.xhtml =================================================================== --- trunk/examples/wiki/view/includes/userControl.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/includes/userControl.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -74,13 +74,13 @@ <s:div id="userControlPanel" styleClass="userControlPanel sessionEventTrigger"> - <h:form id="resetPasswordForm" styleClass="resetPasswordForm" rendered="#{not empty resetPasswordOfUser}"> + <h:form styleClass="resetPasswordForm" rendered="#{not empty resetPasswordOfUser}"> <h:outputText styleClass="label" value="#{messages['lacewiki.label.resetPassword.ResetPasswordOf']} '#{resetPasswordOfUser.username}':"/> - <h:inputSecret styleClass="input" id="password" value="#{userPasswordReset.password}" size="8" tabindex="50"/> + <h:inputSecret styleClass="input" value="#{userPasswordReset.password}" size="8" tabindex="50"/> <h:outputText styleClass="label" value="#{messages['lacewiki.label.resetPassword.Repeat']}:"/> - <h:inputSecret styleClass="input" id="passwordControl" value="#{userPasswordReset.passwordControl}" size="8" tabindex="50"/> + <h:inputSecret styleClass="input" value="#{userPasswordReset.passwordControl}" size="8" tabindex="50"/> <h:commandLink styleClass="button" action="#{userPasswordReset.reset}" tabindex="50"> <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.resetPassword.Reset']}"/> Modified: trunk/examples/wiki/view/includes/wikiTextEditor.xhtml =================================================================== --- trunk/examples/wiki/view/includes/wikiTextEditor.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/includes/wikiTextEditor.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -62,7 +62,7 @@ <s:div styleClass="errorMessage" rendered="#{wiki:hasMessage(namingContainer, wiki:concat(textEditorId, 'TextArea'))}"> <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif" + <h:graphicImage value="#{themePath}/img/attention.gif" width="18" height="18" styleClass="attentionImage"/> <s:span styleClass="attentionMessage"> <h:message for="#{textEditorId}TextArea"/></s:span> Modified: trunk/examples/wiki/view/includes/wikiUploadImageEditor.xhtml =================================================================== --- trunk/examples/wiki/view/includes/wikiUploadImageEditor.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/includes/wikiUploadImageEditor.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -22,17 +22,17 @@ <a:commandLink status="uploadEditFormStatus" id="zoomOut" tabindex="2" action="#{editor.zoomPreviewOut}" reRender="imagePreview, messageBoxContainer" oncomplete="onAjaxRequestComplete()" styleClass="sessionEventTrigger"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/minus.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/minus.gif" width="18" height="18"/> </a:commandLink> <a:commandLink status="uploadEditFormStatus" id="actualSize" tabindex="2" action="#{editor.zoomActualSize}" reRender="imagePreview, messageBoxContainer" oncomplete="onAjaxRequestComplete()" styleClass="sessionEventTrigger"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/equals.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/equals.gif" width="18" height="18"/> </a:commandLink> <a:commandLink status="uploadEditFormStatus" id="zoomIn" tabindex="2" action="#{editor.zoomPreviewIn}" reRender="imagePreview, messageBoxContainer" oncomplete="onAjaxRequestComplete()" styleClass="sessionEventTrigger"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/plus.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/plus.gif" width="18" height="18"/> </a:commandLink> </a:region> </h:panelGroup> Modified: trunk/examples/wiki/view/plugins/blogArchive/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/blogArchive/plugin.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/blogArchive/plugin.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -24,7 +24,7 @@ <h:panelGrid styleClass="smallFont" rendered="#{not empty currentDirectory.feed}" columns="2" cellpadding="2" cellspacing="0" border="0"> <h:outputLink value="#{wiki:renderFeedURL(currentDirectory.feed, null, null)}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/> + <h:graphicImage value="#{themePath}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/> </h:outputLink> <h:outputLink value="#{wiki:renderFeedURL(currentDirectory.feed, null, null)}"> <h:outputText value="#{messages['blogArchive.label.Subscribe']}"/> Modified: trunk/examples/wiki/view/plugins/blogDirectory/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/blogDirectory/plugin.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/blogDirectory/plugin.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -131,19 +131,19 @@ <h:outputLink rendered="#{blogDirectory.pager.previousPageAvailable}" target="_top" value="#{wiki:renderURL(currentDocument)}#{blogDirectory.dateUrl}#{blogDirectory.tagUrl}"> <div style="width:30px;"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.first.gif" width="13" height="11"/> </div> </h:outputLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!blogDirectory.pager.previousPageAvailable}"/> <h:outputLink rendered="#{blogDirectory.pager.previousPageAvailable}" target="_top" value="#{wiki:renderURL(currentDocument)}#{blogDirectory.dateUrl}/Page/#{blogDirectory.pager.previousPage}#{blogDirectory.tagUrl}"> <div style="width:30px;"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.previous.gif" width="13" height="11"/> </div> </h:outputLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!blogDirectory.pager.previousPageAvailable}"/> <s:span> @@ -163,19 +163,19 @@ <h:outputLink rendered="#{blogDirectory.pager.nextPageAvailable}" target="_top" value="#{wiki:renderURL(currentDocument)}#{blogDirectory.dateUrl}/Page/#{blogDirectory.pager.nextPage}#{blogDirectory.tagUrl}"> <div style="width:30px;"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.next.gif" width="13" height="11"/> </div> </h:outputLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!blogDirectory.pager.nextPageAvailable}"/> <h:outputLink rendered="#{blogDirectory.pager.nextPageAvailable}" target="_top" value="#{wiki:renderURL(currentDocument)}#{blogDirectory.dateUrl}/Page/#{blogDirectory.pager.lastPage}#{blogDirectory.tagUrl}"> <div style="width:30px;"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.last.gif" width="13" height="11"/> </div> </h:outputLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!blogDirectory.pager.nextPageAvailable}"/> </h:panelGrid> Modified: trunk/examples/wiki/view/plugins/blogRecentEntries/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/blogRecentEntries/plugin.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/blogRecentEntries/plugin.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -25,7 +25,7 @@ <h:outputLink target="_top" value="#{wiki:renderFeedURL(currentDirectory.feed, null, null)}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/> + <h:graphicImage value="#{themePath}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/> </h:outputLink> <h:outputLink target="_top" Modified: trunk/examples/wiki/view/plugins/dirMenu/dirMenuItem.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/dirMenu/dirMenuItem.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/dirMenu/dirMenuItem.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -16,7 +16,7 @@ <h:outputText value="·"/> <s:span> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dir.gif" + <h:graphicImage value="#{themePath}/img/icon.dir.gif" width="18" height="20"/> </s:span> Modified: trunk/examples/wiki/view/plugins/dirMenu/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/dirMenu/plugin.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/dirMenu/plugin.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -20,7 +20,7 @@ <h:panelGrid rendered="#{not empty currentDirectory.feed}" columns="2" cellpadding="0" cellspacing="0" border="0"> <h:outputLink target="_top" value="#{wiki:renderFeedURL(currentDirectory.feed, null, null)}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki', currentMacro).themeName}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/> + <h:graphicImage value="#{themePath}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/> </h:outputLink> <h:outputLink target="_top" value="#{wiki:renderFeedURL(currentDirectory.feed, null, null)}"> Modified: trunk/examples/wiki/view/plugins/docPager/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/docPager/plugin.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/docPager/plugin.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -12,7 +12,7 @@ <s:div styleClass="undecoratedLink"> <s:fragment rendered="#{not empty docPager.previous}"> <h:outputLink value="#{wiki:renderURL(docPager.previous)}"> - <h:graphicImage styleClass="docPagerButton" value="/themes/#{preferences.get('Wiki').themeName}/img/left.gif" width="18" height="18"/> + <h:graphicImage styleClass="docPagerButton" value="#{themePath}/img/left.gif" width="18" height="18"/> <h:outputText styleClass="docPagerLabel" rendered="#{not preferences.get('DocPager', currentMacro).showNames}" value="#{messages['lacewiki.label.Previous']}"/> @@ -31,7 +31,7 @@ <h:outputText styleClass="docPagerLabel" rendered="#{preferences.get('DocPager', currentMacro).showNames}" value="#{wiki:truncateString(docPager.next.name, 35, '...')}"/> - <h:graphicImage styleClass="docPagerButton" value="/themes/#{preferences.get('Wiki').themeName}/img/right.gif" width="18" height="18"/> + <h:graphicImage styleClass="docPagerButton" value="#{themePath}/img/right.gif" width="18" height="18"/> </h:outputLink> </s:fragment> </s:div> Modified: trunk/examples/wiki/view/plugins/faqBrowser/faqControls.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/faqBrowser/faqControls.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/faqBrowser/faqControls.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -42,13 +42,13 @@ reRender="faqQuestions, faqQuestionsControl, faqCategoryLink, messageBoxContainer" status="faqsSelectorFormStatus" rendered="#{not faqBrowser.directorySelected and not empty faqBrowser.tree and faqBrowser.tree.wrappedChildren.size() > 0}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/down.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/down.gif" width="18" height="18"/> </a:commandLink> <a:commandLink action="#{faqBrowser.hideQuestions}" tabindex="1" reRender="faqQuestions, faqQuestionsControl, faqCategoryLink, messageBoxContainer" status="faqsSelectorFormStatus" rendered="#{faqBrowser.directorySelected and not empty faqBrowser.tree and faqBrowser.tree.wrappedChildren.size() > 0}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/up.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/up.gif" width="18" height="18"/> </a:commandLink> </s:span> Modified: trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -18,7 +18,7 @@ <h:outputLink value="#{wiki:renderAggregateFeedURL(preferences.get('FeedAggregator', currentMacro).aggregateId)}" rendered="#{not empty preferences.get('FeedAggregator', currentMacro).aggregateId}" style="margin-right:10px;"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom" + <h:graphicImage value="#{themePath}/img/icon.atom.ongrey.gif" width="18" height="18" alt="Atom" /> </h:outputLink> Modified: trunk/examples/wiki/view/plugins/forumList/forumListControls.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumList/forumListControls.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/forumList/forumListControls.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -13,7 +13,7 @@ <s:div styleClass="forumsFeedLink undecoratedLink" rendered="#{not empty currentDirectory.feed}"> <h:outputLink value="#{wiki:renderFeedURL(currentDirectory.feed, null, null)}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/icon.atom.gif" width="18" height="18"/> <h:outputText value="#{currentDocument.name} #{messages['forum.label.Feed']}"/> </h:outputLink> </s:div> Modified: trunk/examples/wiki/view/plugins/forumList/forumListTable.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumList/forumListTable.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/forumList/forumListTable.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -30,23 +30,23 @@ <h:panelGroup> <h:outputLink styleClass="undecoratedLink" value="#{wiki:renderURL(f.forum)}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.posting_unread.gif" width="22" height="26" + <h:graphicImage value="#{themePath}/img/icon.posting_unread.gif" width="22" height="26" rendered="#{f.unreadPostings}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.posting.gif" width="22" height="26" + <h:graphicImage value="#{themePath}/img/icon.posting.gif" width="22" height="26" rendered="#{not f.unreadPostings}"/> </h:outputLink> <s:span styleClass="forumFeedLink undecoratedLink" rendered="#{not empty f.forum.feed}"> <h:outputLink value="#{wiki:renderFeedURL(f.forum.feed, null, null)}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/icon.atom.gif" width="18" height="18"/> </h:outputLink> </s:span> <s:span styleClass="forumFeedLink" rendered="#{empty f.forum.feed}"> <h:graphicImage rendered="#{empty f.forum.feed}" - value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="18" height="18"/> + value="#{themePath}/img/blank.gif" width="18" height="18"/> </s:span> </h:panelGroup> Modified: trunk/examples/wiki/view/plugins/forumList/lastTopicPost.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumList/lastTopicPost.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/forumList/lastTopicPost.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -11,7 +11,7 @@ <s:div> <h:outputLink value="#{link}" tabindex="1"> <h:outputText value="#{wiki:truncateString(name, 15, '...')}"/> - <h:graphicImage styleClass="topicGotoIcon" value="/themes/#{preferences.get('Wiki').themeName}/img/icon.posting_goto.gif" width="18" height="9"/> + <h:graphicImage styleClass="topicGotoIcon" value="#{themePath}/img/icon.posting_goto.gif" width="18" height="9"/> </h:outputLink> </s:div> Modified: trunk/examples/wiki/view/plugins/forumPosting/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumPosting/plugin.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/forumPosting/plugin.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -10,7 +10,7 @@ <ui:decorate template="forumPostingHeader.xhtml"> <ui:define name="subjectIcon"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.posting.gif" + <h:graphicImage value="#{themePath}/img/icon.posting.gif" width="22" height="26"/> </ui:define> </ui:decorate> Modified: trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/forumReplies/plugin.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -83,7 +83,7 @@ <h:graphicImage styleClass="item#{c.id}-rate#{r}" onmouseover="highlightStars('#{c.id}', '5', '#{r}')" onmouseout="highlightStars('#{c.id}', '5', '0')" - value="/themes/#{preferences.get('Wiki').themeName}/img/star_grey.gif" + value="#{themePath}/img/star_grey.gif" alt="*" width="16" height="16"/> </a:commandLink> @@ -97,7 +97,7 @@ border="0" cellpadding="0" cellspacing="0"> <h:outputText styleClass="smallFont" value="#{messages['lacewiki.label.comment.Rating']}: "/> <c:forEach begin="1" var="r" end="#{c.rating}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/star.gif" + <h:graphicImage value="#{themePath}/img/star.gif" width="16" height="16" alt="*"/> </c:forEach> </h:panelGrid> Modified: trunk/examples/wiki/view/plugins/forumStickyPosting/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumStickyPosting/plugin.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/forumStickyPosting/plugin.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -10,7 +10,7 @@ <ui:decorate template="../forumPosting/forumPostingHeader.xhtml"> <ui:define name="subjectIcon"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.posting_sticky.gif" + <h:graphicImage value="#{themePath}/img/icon.posting_sticky.gif" width="22" height="26"/> </ui:define> </ui:decorate> Modified: trunk/examples/wiki/view/plugins/forumTopics/topicControls.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumTopics/topicControls.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/forumTopics/topicControls.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -19,7 +19,7 @@ <s:div styleClass="forumsFeedLink undecoratedLink" rendered="#{not empty currentDirectory.feed}"> <h:outputLink value="#{wiki:renderFeedURL(currentDirectory.feed, null, null)}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/icon.atom.gif" width="18" height="18"/> <h:outputText value="#{currentDocument.name} #{messages['forum.label.Feed']}"/> </h:outputLink> </s:div> Modified: trunk/examples/wiki/view/plugins/forumTopics/topicPager.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumTopics/topicPager.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/forumTopics/topicPager.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -13,16 +13,16 @@ <h:outputLink rendered="#{forumQuery.pager.previousPageAvailable}" target="_top" value="#{wiki:renderURL(currentDocument)}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.first.gif" width="13" height="11"/> </h:outputLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!forumQuery.pager.previousPageAvailable}"/> <h:outputLink rendered="#{forumQuery.pager.previousPageAvailable}" target="_top" value="#{wiki:renderURL(currentDocument)}/Page/#{forumQuery.pager.previousPage}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.previous.gif" width="13" height="11"/> </h:outputLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!forumQuery.pager.previousPageAvailable}"/> <s:span> @@ -34,16 +34,16 @@ <h:outputLink rendered="#{forumQuery.pager.nextPageAvailable}" target="_top" value="#{wiki:renderURL(currentDocument)}/Page/#{forumQuery.pager.nextPage}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.next.gif" width="13" height="11"/> </h:outputLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!forumQuery.pager.nextPageAvailable}"/> <h:outputLink rendered="#{forumQuery.pager.nextPageAvailable}" target="_top" value="#{wiki:renderURL(currentDocument)}/Page/#{forumQuery.pager.lastPage}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.last.gif" width="13" height="11"/> </h:outputLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!forumQuery.pager.nextPageAvailable}"/> </h:panelGrid> Modified: trunk/examples/wiki/view/plugins/forumTopics/topicTable.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/forumTopics/topicTable.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/forumTopics/topicTable.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -28,7 +28,7 @@ <h:column> <f:facet name="header"> </f:facet> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.#{t.iconName}.gif" width="22" height="26"/> + <h:graphicImage value="#{themePath}/img/icon.#{t.iconName}.gif" width="22" height="26"/> </h:column> <h:column> @@ -63,7 +63,7 @@ <h:outputText value="#{t.lastComment.createdOn}"> <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/> </h:outputText> - <h:graphicImage styleClass="topicGotoIcon" value="/themes/#{preferences.get('Wiki').themeName}/img/icon.posting_goto.gif" width="18" height="9"/> + <h:graphicImage styleClass="topicGotoIcon" value="#{themePath}/img/icon.posting_goto.gif" width="18" height="9"/> </h:outputLink> <ui:include src="../../includes/userInfoLink.xhtml"> @@ -77,7 +77,7 @@ <h:outputText value="#{t.topic.createdOn}"> <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/> </h:outputText> - <h:graphicImage styleClass="topicGotoIcon" value="/themes/#{preferences.get('Wiki').themeName}/img/icon.posting_goto.gif" width="18" height="9"/> + <h:graphicImage styleClass="topicGotoIcon" value="#{themePath}/img/icon.posting_goto.gif" width="18" height="9"/> </h:outputLink> <ui:include src="../../includes/userInfoLink.xhtml"> Modified: trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml =================================================================== --- trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/plugins/jiraIssueList/plugin.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -24,7 +24,7 @@ cellpadding="0" cellspacing="0" border="0"> <h:column> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.priority.#{i.priorityIcon}.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/icon.priority.#{i.priorityIcon}.gif" width="18" height="18"/> </h:column> <h:column> Modified: trunk/examples/wiki/view/search_d.xhtml =================================================================== --- trunk/examples/wiki/view/search_d.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/search_d.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -147,16 +147,16 @@ <h:commandLink action="#{wikiSearch.firstPage()}" styleClass="sessionEventTrigger" rendered="#{wikiSearch.previousPageAvailable}" tabindex="7"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.first.gif" width="13" height="11"/> </h:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!wikiSearch.previousPageAvailable}"/> <h:commandLink action="#{wikiSearch.previousPage()}" styleClass="sessionEventTrigger" rendered="#{wikiSearch.previousPageAvailable}" tabindex="7"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.previous.gif" width="13" height="11"/> </h:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!wikiSearch.previousPageAvailable}"/> <h:outputText value="#{wikiSearch.firstRow} #{messages['lacewiki.label.search.To']} @@ -165,16 +165,16 @@ <h:commandLink action="#{wikiSearch.nextPage()}" styleClass="sessionEventTrigger" rendered="#{wikiSearch.nextPageAvailable}" tabindex="7"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.next.gif" width="13" height="11"/> </h:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!wikiSearch.nextPageAvailable}"/> <h:commandLink action="#{wikiSearch.lastPage()}" styleClass="sessionEventTrigger" rendered="#{wikiSearch.nextPageAvailable}" tabindex="7"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.last.gif" width="13" height="11"/> </h:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!wikiSearch.nextPageAvailable}"/> </h:panelGrid> @@ -193,7 +193,7 @@ <h:column> <h:panelGrid columns="2"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{hit.icon}" width="18" height="20"/> + <h:graphicImage value="#{themePath}/img/#{hit.icon}" width="18" height="20"/> <h:outputLink value="#{hit.link}" tabindex="1"><h:outputText escape="false" value="#{hit.title}"/></h:outputLink> </h:panelGrid> <h:outputText styleClass="smallFont" escape="false" value="#{hit.fragment}"/> Modified: trunk/examples/wiki/view/search_m.xhtml =================================================================== --- trunk/examples/wiki/view/search_m.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/search_m.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -62,7 +62,7 @@ <h:column> <h:panelGrid columns="2"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{hit.icon}" width="18" height="20"/> + <h:graphicImage value="#{themePath}/img/#{hit.icon}" width="18" height="20"/> <h:outputLink value="#{hit.link}" tabindex="1"><h:outputText escape="false" value="#{hit.title}"/></h:outputLink> </h:panelGrid> <h:outputText escape="false" value="#{hit.fragment}"/> Modified: trunk/examples/wiki/view/tagDisplay_d.xhtml =================================================================== --- trunk/examples/wiki/view/tagDisplay_d.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/tagDisplay_d.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -33,13 +33,13 @@ <h:outputText value="#{messages['lacewiki.label.tagDisplay.Tag']}: #{tagQuery.tag}"/> </f:facet> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.doc.gif" + <h:graphicImage value="#{themePath}/img/icon.doc.gif" width="18" height="20" style="vertical-align:middle;margin-right: 5px;" rendered="#{file.isInstance('WikiDocument')}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes[file.contentType].displayIcon}" + <h:graphicImage value="#{themePath}/img/#{uploadTypes[file.contentType].displayIcon}" width="18" height="20" style="vertical-align:middle;margin-right: 5px;" rendered="#{file.isInstance('WikiUpload') and !empty uploadTypes[file.contentType]}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes['generic'].displayIcon}" + <h:graphicImage value="#{themePath}/img/#{uploadTypes['generic'].displayIcon}" width="18" height="20" style="vertical-align:middle;margin-right: 5px;" rendered="#{file.isInstance('WikiUpload') and empty uploadTypes[file.contentType]}"/> @@ -70,7 +70,7 @@ <f:facet name="header"> <h:outputText value="#{messages['lacewiki.label.tagDisplay.InDirectory']}"/> </f:facet> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.dir.gif" + <h:graphicImage value="#{themePath}/img/icon.dir.gif" width="18" height="20" style="vertical-align: middle; margin-right: 5px;"/> <s:link value="#{wiki:truncateString(file.parent.name, 20, '...')}" propagation="none" view="/dirDisplay_#{skin}.xhtml" Modified: trunk/examples/wiki/view/themes/default/m/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/default/m/template.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/themes/default/m/template.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -30,7 +30,7 @@ <s:div rendered="#{!empty facesMessages.currentGlobalMessages}"> <ui:repeat var="message" value="#{facesMessages.currentGlobalMessages}"> <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0" columnClasses="messageBoxCell"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/info.gif" + <h:graphicImage value="#{themePath}/img/info.gif" width="18" height="18" styleClass="infoImage"/> <h:outputText styleClass="infoMessage" value="#{message.summary}"/> Modified: trunk/examples/wiki/view/themes/default/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/default/template.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/themes/default/template.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -272,7 +272,8 @@ $.contextMenu.defaults({ shadow: false, menuStyle: { - padding: '0' + padding: '0', + width: '200px' }, itemStyle: { border: 'none', @@ -348,7 +349,7 @@ <ui:define name="mainMenuFooter"> <s:div styleClass="feeds" rendered="#{preferences.get('Wiki').showSiteFeedInMenu}"> <h:outputLink value="#{wiki:renderFeedURL(wikiRoot.feed, null, null)}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/icon.atom.gif" width="18" height="18"/> #{messages['lacewiki.button.SiteFeed']} </h:outputLink> </s:div> @@ -375,7 +376,7 @@ <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0" rendered="#{message.severity.ordinal == 0}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/info.gif" + <h:graphicImage value="#{themePath}/img/info.gif" width="18" height="18" styleClass="infoImage"/> <h:outputText styleClass="infoMessage" value="#{message.summary}"/> @@ -383,7 +384,7 @@ <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0" rendered="#{message.severity.ordinal > 0}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif" + <h:graphicImage value="#{themePath}/img/attention.gif" rendered="#{message.severity.ordinal > 0}" width="18" height="18" styleClass="attentionImage"/> Modified: trunk/examples/wiki/view/themes/inrelationto/m/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/inrelationto/m/template.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/themes/inrelationto/m/template.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -31,7 +31,7 @@ <s:div rendered="#{!empty facesMessages.currentGlobalMessages}"> <ui:repeat var="message" value="#{facesMessages.currentGlobalMessages}"> <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0" columnClasses="messageBoxCell"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/info.gif" + <h:graphicImage value="#{themePath}/img/info.gif" width="18" height="18" styleClass="infoImage"/> <h:outputText styleClass="infoMessage" value="#{message.summary}"/> Added: trunk/examples/wiki/view/themes/inrelationto/mailtemplates/test.xhtml =================================================================== --- trunk/examples/wiki/view/themes/inrelationto/mailtemplates/test.xhtml (rev 0) +++ trunk/examples/wiki/view/themes/inrelationto/mailtemplates/test.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -0,0 +1,40 @@ +<m:message xmlns="http://www.w3.org/1999/xhtml" + xmlns:m="http://jboss.com/products/seam/mail" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + <m:header name="X-Sent-From" value="JBoss Seam" /> + <m:from name="Seam Wiki" address="do-not-reply(a)jboss.com" /> + <m:to name="#{user.firstname} #{user.lastname}">#{user.email}</m:to> + <m:subject>[Seam Wiki] Registration Confirmation</m:subject> + <m:body> + <html> + <body> + Hello #{user.firstname} #{user.lastname}, + + + you registered an account on the Seam Wiki. You need to click the following link to confirm the + validity of your e-mail address and to activate your account: + + <h:outputLink value="#{preferences.get('Wiki').baseURL}/confirmRegistration.seam?activationCode=#{user.activationCode}">Click this link to activate the account '#{user.username}'</h:outputLink> + + + Regards, + JBoss Seam Wiki + + </body> + </html> + <f:facet name="alternative"> + <h:outputText> +Hello #{user.firstname} #{user.lastname}, + +you registered an account on the Seam Wiki. You need to use the following link to confirm the +validity of your e-mail address and to activate your account: + +#{preferences.get('Wiki').baseURL}/confirmRegistration.seam?activationCode=#{user.activationCode} + +Regards, +JBoss Seam Wiki + </h:outputText> + </f:facet> + </m:body> +</m:message> Modified: trunk/examples/wiki/view/themes/inrelationto/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/inrelationto/template.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/themes/inrelationto/template.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -271,7 +271,8 @@ $.contextMenu.defaults({ shadow: false, menuStyle: { - padding: '0' + padding: '0', + width: '200px' }, itemStyle: { border: 'none', @@ -307,7 +308,7 @@ <s:div id="headerTopTwo"> <s:div styleClass="sitename"> <h:outputLink value="#{preferences.get('Wiki').baseUrl}" styleClass="sitenameLink"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/inrelationto.gif" width="214" height="25"/> + <h:graphicImage value="#{themePath}/img/inrelationto.gif" width="214" height="25"/> </h:outputLink> </s:div> <ui:include src="../../includes/userControl.xhtml"/> @@ -350,7 +351,7 @@ <ui:define name="mainMenuHeader"> <s:div styleClass="feeds" rendered="#{preferences.get('Wiki').showSiteFeedInMenu}"> <h:outputLink value="#{wiki:renderFeedURL(wikiRoot.feed, null, null)}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.gif" width="18" height="18"/> + <h:graphicImage value="#{themePath}/img/icon.atom.gif" width="18" height="18"/> #{messages['lacewiki.button.SiteFeed']} </h:outputLink> </s:div> @@ -371,7 +372,7 @@ <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0" rendered="#{message.severity.ordinal == 0}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/info.gif" + <h:graphicImage value="#{themePath}/img/info.gif" width="18" height="18" styleClass="messageBoxImage infoImage"/> <h:outputText styleClass="infoMessage" value="#{message.summary}"/> @@ -379,7 +380,7 @@ <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0" rendered="#{message.severity.ordinal > 0}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif" + <h:graphicImage value="#{themePath}/img/attention.gif" rendered="#{message.severity.ordinal > 0}" width="18" height="18" styleClass="messageBoxImage attentionImage"/> Modified: trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/themes/sfwkorg/css/sfwk.css 2008-02-06 10:00:05 UTC (rev 7379) @@ -178,7 +178,7 @@ #header { margin: 0; padding:0; - background-image:url(../img/hrd_bkgimage_fade_alpha.gif); + background-image:url(../img/hrd_bkgimage_fade.gif); background-repeat:no-repeat; background-color:#32332b; border-bottom:1px solid #878888; @@ -270,54 +270,56 @@ /* ----- Homepage styles ------ */ -.homepageNews { +.homepageBox { font-size: 90%; } -.homepageNews .boxHeader { +.homepageBox .boxHeader { background: none; border: none; border-bottom: 1px solid #b6b6b6; padding-left: 0; padding-bottom: 5px; text-align: right; + font-size: 145%; + line-height: 100%; } -.homepageNews .boxContent { +.homepageBox .boxContent { background: none; border: none; padding-left: 0; } -.homepageNews .boxFooter { +.homepageBox .boxFooter { background: none; border: none; padding-left: 0; } -.homepageNews .feedAggregatorSubscribe { +.homepageBox .feedAggregatorSubscribe { font-size: 110%; } -.homepageNews .feedEntryColumn { +.homepageBox .feedEntryColumn { padding: 0; } -.homepageNews .feedEntryTitle { +.homepageBox .feedEntryTitle { margin-top: 3px; margin-bottom: 3px; } -.homepageNews .feedEntryBody { +.homepageBox .feedEntryBody { margin-top: 4px; margin-bottom: 4px; } -.homepageNews .teaserColumn { +.homepageBox .teaserColumn { border-bottom: 1px solid #b6b6b6; } -.homepageNews .rowOdd td, .homepageNews .rowEven td { +.homepageBox .rowOdd td, .homepageBox .rowEven td { padding: 2px; /* border-bottom: 1px solid #b6b6b6; */ } Modified: trunk/examples/wiki/view/themes/sfwkorg/m/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/m/template.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/themes/sfwkorg/m/template.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -26,7 +26,7 @@ <s:div rendered="#{!empty facesMessages.currentGlobalMessages}"> <ui:repeat var="message" value="#{facesMessages.currentGlobalMessages}"> <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0" columnClasses="messageBoxCell"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/info.gif" + <h:graphicImage value="#{themePath}/img/info.gif" width="18" height="18" styleClass="infoImage"/> <h:outputText styleClass="infoMessage" value="#{message.summary}"/> Modified: trunk/examples/wiki/view/themes/sfwkorg/template.xhtml =================================================================== --- trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -311,7 +311,7 @@ <div> <h:outputLink value="#{preferences.get('Wiki').baseUrl}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="210" height="98"/> + <h:graphicImage value="#{themePath}/img/blank.gif" width="210" height="98"/> </h:outputLink> </div> @@ -329,7 +329,7 @@ <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0" styleClass="feeds" rendered="#{preferences.get('Wiki').showSiteFeedInMenu}"> <h:outputLink styleClass="feedLink" value="#{wiki:renderFeedURL(wikiRoot.feed, null, null)}"> - <h:graphicImage styleClass="feedIcon" value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.onbrown.gif" width="18" height="18"/> + <h:graphicImage styleClass="feedIcon" value="#{themePath}/img/icon.atom.onbrown.gif" width="18" height="18"/> </h:outputLink> <h:outputLink styleClass="feedLink" value="#{wiki:renderFeedURL(wikiRoot.feed, null, null)}"> #{messages['lacewiki.button.SiteFeed']} @@ -381,18 +381,19 @@ </s:div> <div style="margin-top: 25px; margin-left: 15px; margin-right: 15px; "> - <h2>What is happening here?</h2> + <h2>See Seam in action...</h2> - We are building the new Seam community website publicly. You - are invited to contribute. Please do not link to this website at this time, the addresses and URLs - will change when we go live. If you find a bug or get hit by an exception, please - send an e-mail with a full description to <a href="mailto:christian.bauer(at)gmail.com">Christian</a>. + We have created two demo e-commerce applications with Seam: + <a href="http://seam.demo.jboss.com/home.seam">Hotel Booking</a> + and the <a href="http://dvdstore.demo.jboss.com/home.seam">DVD Store</a>. + You can find the code for these demos in the + <a href="http:/www.seamframework.org/Download">Seam download package</a>. </div> <div style="margin-top: 25px; margin-left: 15px; margin-right: 15px; text-align:center;"> <h:outputLink value="http://seamframework.org/Community/GetASeamIcon"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/runningon_seamlogo_beige.gif" + <h:graphicImage value="#{themePath}/img/runningon_seamlogo_beige.gif" width="200" height="50"/> </h:outputLink> </div> @@ -402,7 +403,7 @@  <div id="rightColumn"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="1" height="1"/> + <h:graphicImage value="#{themePath}/img/blank.gif" width="1" height="1"/> <ui:include src="../../includes/breadcrumb.xhtml"/>  @@ -412,7 +413,7 @@ <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0" rendered="#{message.severity.ordinal == 0}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/info.gif" + <h:graphicImage value="#{themePath}/img/info.gif" width="18" height="18" styleClass="messageBoxImage infoImage"/> <h:outputText styleClass="infoMessage" value="#{message.summary}"/> @@ -420,7 +421,7 @@ <h:panelGrid styleClass="messageBoxTable" columns="2" cellpadding="0" cellspacing="0" border="0" rendered="#{message.severity.ordinal > 0}"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif" + <h:graphicImage value="#{themePath}/img/attention.gif" rendered="#{message.severity.ordinal > 0}" width="18" height="18" styleClass="messageBoxImage attentionImage"/> Modified: trunk/examples/wiki/view/userList_d.xhtml =================================================================== --- trunk/examples/wiki/view/userList_d.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/userList_d.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -98,29 +98,29 @@ rendered="#{userSearch.rowCount > 0}"> <h:commandLink action="#{userSearch.firstPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.first.gif" width="13" height="11"/> </h:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!userSearch.previousPageAvailable}"/> <h:commandLink action="#{userSearch.previousPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.previous.gif" width="13" height="11"/> </h:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!userSearch.previousPageAvailable}"/> <h:outputText value="#{messages['lacewiki.label.userList.Found']} #{userSearch.rowCount} #{messages['lacewiki.label.userList.Members']}"/> <h:commandLink action="#{userSearch.nextPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.next.gif" width="13" height="11"/> </h:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!userSearch.nextPageAvailable}"/> <h:commandLink action="#{userSearch.lastPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/> + <h:graphicImage value="#{themePath}/img/page.last.gif" width="13" height="11"/> </h:commandLink> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11" + <h:graphicImage value="#{themePath}/img/blank.gif" width="13" height="11" rendered="#{!userSearch.nextPageAvailable}"/> </h:panelGrid> @@ -144,9 +144,9 @@ <h:column> <f:facet name="header"> <h:commandLink action="#{userSearch.sortBy('username')}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.up.gif" width="8" height="8" rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.down.gif" width="8" height="8" rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/> <h:outputText value="#{messages['lacewiki.label.userList.Username']}"/> </h:commandLink> @@ -165,9 +165,9 @@ <h:column> <f:facet name="header"> <h:commandLink action="#{userSearch.sortBy('firstname')}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.up.gif" width="8" height="8" rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.down.gif" width="8" height="8" rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/> <h:outputText value="#{messages['lacewiki.label.userList.FirstName']}"/> </h:commandLink> @@ -178,9 +178,9 @@ <h:column> <f:facet name="header"> <h:commandLink action="#{userSearch.sortBy('lastname')}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.up.gif" width="8" height="8" rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.down.gif" width="8" height="8" rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/> <h:outputText value="#{messages['lacewiki.label.userList.LastName']}"/> </h:commandLink> @@ -191,9 +191,9 @@ <h:column rendered="#{wiki:showEmailAddress()}"> <f:facet name="header"> <h:commandLink action="#{userSearch.sortBy('email')}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.up.gif" width="8" height="8" rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.down.gif" width="8" height="8" rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/> <h:outputText value="#{messages['lacewiki.label.userList.Email']}"/> </h:commandLink> @@ -204,9 +204,9 @@ <h:column> <f:facet name="header"> <h:commandLink action="#{userSearch.sortBy('createdOn')}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.up.gif" width="8" height="8" rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'createdOn'}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.down.gif" width="8" height="8" rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'createdOn'}"/> <h:outputText value="#{messages['lacewiki.label.userList.JoinedOn']}"/> </h:commandLink> @@ -219,9 +219,9 @@ <h:column> <f:facet name="header"> <h:commandLink action="#{userSearch.sortBy('lastLoginOn')}" tabindex="1"> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.up.gif" width="8" height="8" rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'lastLoginOn'}"/> - <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8" + <h:graphicImage value="#{themePath}/img/sortindicator.down.gif" width="8" height="8" rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'lastLoginOn'}"/> <h:outputText value="#{messages['lacewiki.label.userList.LastLoginOn']}"/> </h:commandLink> Modified: trunk/examples/wiki/view/userRegister_d.xhtml =================================================================== --- trunk/examples/wiki/view/userRegister_d.xhtml 2008-02-06 09:50:26 UTC (rev 7378) +++ trunk/examples/wiki/view/userRegister_d.xhtml 2008-02-06 10:00:05 UTC (rev 7379) @@ -5,7 +5,6 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:a="https://ajax4jsf.dev.java.net/ajax" template="themes/#{preferences.get('Wiki').themeName}/template.xhtml"> <ui:define name="screenname"> @@ -41,64 +40,37 @@ <div class="formFields formBorder wideLabels"> - <a:region> <s:decorate id="firstnameDecorate" template="includes/formFieldDecorate.xhtml"> <ui:define name="label">#{messages['lacewiki.label.userRegister.FirstName']}</ui:define> - <h:inputText styleClass="ajaxSupport" tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.firstname}"> - <a:support status="userRegisterFormStatus" event="onchange" reRender="firstnameDecorate" oncomplete="onAjaxRequestComplete()"/> - </h:inputText> + <h:inputText tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.firstname}"/> </s:decorate> - </a:region> - <a:region> <s:decorate id="lastnameDecorate" template="includes/formFieldDecorate.xhtml"> <ui:define name="label">#{messages['lacewiki.label.userRegister.LastName']}</ui:define> - <h:inputText styleClass="ajaxSupport" tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.lastname}"> - <a:support status="userRegisterFormStatus" event="onchange" reRender="lastnameDecorate" oncomplete="onAjaxRequestComplete()"/> - </h:inputText> + <h:inputText tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.lastname}"/> </s:decorate> - </a:region> - <a:region> <s:decorate id="emailDecorate" template="includes/formFieldDecorate.xhtml"> <ui:define name="label">#{messages['lacewiki.label.userRegister.Email']}</ui:define> - <h:inputText styleClass="ajaxSupport" tabindex="1" size="40" maxlength="255" required="true" value="#{userHome.instance.email}"> - <a:support status="userRegisterFormStatus" event="onchange" reRender="emailDecorate" oncomplete="onAjaxRequestComplete()"/> - </h:inputText> + <h:inputText tabindex="1" size="40" maxlength="255" required="true" value="#{userHome.instance.email}"/> </s:decorate> - </a:region> - <a:region> <s:decorate id="usernameDecorate" template="includes/formFieldDecorate.xhtml"> <ui:define name="label">#{messages['lacewiki.label.userRegister.Username']}</ui:define> - <h:inputText styleClass="ajaxSupport" tabindex="1" size="16" maxlength="16" required="true" id="username" value="#{userHome.instance.username}"> - <a:support status="userRegisterFormStatus" event="onchange" action="#{userHome.validateUsername}" - reRender="usernameDecorate" oncomplete="onAjaxRequestComplete()"/> - </h:inputText> + <h:inputText id="username" tabindex="1" size="16" maxlength="16" required="true" value="#{userHome.instance.username}"/> </s:decorate> - </a:region> - <a:region> <s:decorate id="passwordDecorate" template="includes/formFieldDecorate.xhtml"> <ui:define name="label">#{messages['lacewiki.label.userRegister.Password']}</ui:define> - <h:inputSecret styleClass="ajaxSupport" tabindex="1" size="15" maxlength="15" - redisplay="true" value="#{userHome.password}"> - <a:support status="userRegisterFormStatus" event="onchange" action="#{userHome.validatePassword}" - reRender="passwordDecorate" oncomplete="onAjaxRequestComplete()"/> - </h:inputSecret> + <h:inputSecret id="password" tabindex="1" size="15" maxlength="15" required="true" + redisplay="true" value="#{userHome.password}"/> </s:decorate> - </a:region> - <a:region> <s:decorate id="passwordControlDecorate" template="includes/formFieldDecorate.xhtml"> <ui:define name="label">#{messages['lacewiki.label.userRegister.RepeatPassword']}</ui:define> - <h:inputSecret styleClass="ajaxSupport" tabindex="1" size="15" maxlength="15" - redisplay="true" value="#{userHome.passwordControl}"> - <a:support status="userRegisterFormStatus" event="onchange" action="#{userHome.validatePasswordControl}" - reRender="passwordControlDecorate" oncomplete="onAjaxRequestComplete()"/> - </h:inputSecret> + <h:inputSecret id="passwordControl" tabindex="1" size="15" maxlength="15" required="true" + redisplay="true" value="#{userHome.passwordControl}"/> </s:decorate> - </a:region> <s:decorate id="verifyCaptchaEntry" template="includes/captchaEntry.xhtml"> <ui:param name="statusId" value="userRegisterFormStatus"/>

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits February 2008