[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs ...
Christian Bauer
christian at hibernate.org
Tue Jun 12 08:29:59 EDT 2007
User: cbauer
Date: 07/06/12 08:29:59
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs
DocumentEditorPreferences.java WikiPreferences.java
UserManagementPreferences.java
CommentsPreferences.java
Log:
Completed first iteration of search engine
Revision Changes Path
1.4 +4 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/DocumentEditorPreferences.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DocumentEditorPreferences.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/DocumentEditorPreferences.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- DocumentEditorPreferences.java 3 May 2007 14:10:50 -0000 1.3
+++ DocumentEditorPreferences.java 12 Jun 2007 12:29:59 -0000 1.4
@@ -7,12 +7,13 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.ScopeType;
import org.hibernate.validator.Range;
+import org.hibernate.validator.NotNull;
import java.io.Serializable;
@Name("docEditorPreferences")
@Scope(ScopeType.CONVERSATION)
- at Preference(description = "A. Document Editor", visibility = PreferenceVisibility.USER)
+ at Preference(description = "Core: Document Editor", visibility = PreferenceVisibility.USER)
public class DocumentEditorPreferences extends PreferenceSupport implements Serializable {
public String getCurrentUserVariable() { return "currentUser"; }
@@ -23,10 +24,12 @@
@Preference(description = "02. Rows shown in text editor by default", visibility = PreferenceVisibility.SYSTEM)
@Range(min = 5l, max = 100l)
+ @NotNull
private Long regularEditAreaRows;
@Preference(description = "03. Columns shown in text editor", visibility = PreferenceVisibility.USER)
@Range(min = 5l, max = 250l)
+ @NotNull
private Long regularEditAreaColumns;
}
1.8 +11 -3 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiPreferences.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- WikiPreferences.java 26 Apr 2007 15:11:51 -0000 1.7
+++ WikiPreferences.java 12 Jun 2007 12:29:59 -0000 1.8
@@ -9,43 +9,51 @@
import org.jboss.seam.ScopeType;
import org.hibernate.validator.Length;
import org.hibernate.validator.Range;
+import org.hibernate.validator.NotNull;
import java.io.Serializable;
@Name("wikiPreferences")
@AutoCreate
@Scope(ScopeType.CONVERSATION)
- at Preference(description = "A. Wiki Preferences", visibility = PreferenceVisibility.SYSTEM)
+ at Preference(description = "Core: Wiki Preferences", visibility = PreferenceVisibility.SYSTEM)
public class WikiPreferences extends PreferenceSupport implements Serializable {
@Preference(description = "01. Base URL without trailing slash (e.g. 'http://my.wiki.server/installdir')", visibility = PreferenceVisibility.SYSTEM)
@Length(min = 8, max = 255)
+ @NotNull
private String baseUrl;
@Preference(description = "02. Timezone of server (ID as defined in java.util.TimeZone)", visibility = PreferenceVisibility.SYSTEM)
@Length(min = 3, max = 63)
+ @NotNull
private String timeZone;
@Preference(description = "03. Theme directory name", visibility = PreferenceVisibility.SYSTEM)
@Length(min = 3, max = 20)
+ @NotNull
private String themeName;
@Preference(description = "04. Identifier of member area (home directories)", visibility = PreferenceVisibility.SYSTEM)
+ @NotNull
private Long memberAreaId;
@Preference(description = "05. Identifier of the default start document of the Wiki", visibility = PreferenceVisibility.SYSTEM)
+ @NotNull
private Long defaultDocumentId;
@Preference(description = "06. Render all links as permanent numeric identifier links (or as /Wiki/WordLinks)", visibility = PreferenceVisibility.SYSTEM)
- private boolean renderPermlinks;
+ private Boolean renderPermlinks;
@Preference(description = "07. Append this suffix to permanent identifier", visibility = PreferenceVisibility.SYSTEM)
@Length(min = 2, max = 20)
@org.hibernate.validator.Pattern(regex="\\.[a-zA-z]+")
+ @NotNull
private String permlinkSuffix;
@Preference(description = "08. Purge feed entries after N days", visibility = PreferenceVisibility.SYSTEM)
@Range(min = 1l, max = 999l)
+ @NotNull
private Long purgeFeedEntriesAfterDays;
public String getBaseUrl() {
@@ -68,7 +76,7 @@
return defaultDocumentId;
}
- public boolean isRenderPermlinks() {
+ public Boolean isRenderPermlinks() {
return renderPermlinks;
}
1.4 +9 -5 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/UserManagementPreferences.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UserManagementPreferences.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/UserManagementPreferences.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- UserManagementPreferences.java 20 Apr 2007 09:10:13 -0000 1.3
+++ UserManagementPreferences.java 12 Jun 2007 12:29:59 -0000 1.4
@@ -8,32 +8,36 @@
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.ScopeType;
import org.hibernate.validator.Length;
+import org.hibernate.validator.NotNull;
import java.io.Serializable;
@Name("userManagementPreferences")
@AutoCreate
@Scope(ScopeType.CONVERSATION)
- at Preference(description = "A. User Management", visibility = PreferenceVisibility.SYSTEM)
+ at Preference(description = "Core: User Management", visibility = PreferenceVisibility.SYSTEM)
public class UserManagementPreferences extends PreferenceSupport implements Serializable {
@Preference(description = "01. Secret salt used to generate activation codes", visibility = PreferenceVisibility.SYSTEM)
@Length(min = 5, max = 20)
+ @NotNull
private String activationCodeSalt;
@Preference(description = "02. Regex used for password strength verification", visibility = PreferenceVisibility.SYSTEM)
@Length(min = 2, max = 100)
+ @NotNull
private String passwordRegex;
@Preference(description = "03. Default role name of new users after registration", visibility = PreferenceVisibility.SYSTEM)
@Length(min = 3, max = 255)
+ @NotNull
private String newUserInRole;
@Preference(description = "04. Enable free user registration", visibility = PreferenceVisibility.SYSTEM)
- private boolean enableRegistration;
+ private Boolean enableRegistration;
@Preference(description = "05. Create home directory for new user after activation", visibility = PreferenceVisibility.SYSTEM)
- private boolean createHomeAfterUserActivation;
+ private Boolean createHomeAfterUserActivation;
public String getActivationCodeSalt() {
return activationCodeSalt;
@@ -47,11 +51,11 @@
return newUserInRole;
}
- public boolean isEnableRegistration() {
+ public Boolean isEnableRegistration() {
return enableRegistration;
}
- public boolean isCreateHomeAfterUserActivation() {
+ public Boolean isCreateHomeAfterUserActivation() {
return createHomeAfterUserActivation;
}
}
1.2 +2 -2 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/CommentsPreferences.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CommentsPreferences.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/CommentsPreferences.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CommentsPreferences.java 19 Apr 2007 09:32:07 -0000 1.1
+++ CommentsPreferences.java 12 Jun 2007 12:29:59 -0000 1.2
@@ -12,7 +12,7 @@
@Name("commentsPreferences")
@Scope(ScopeType.CONVERSATION)
- at Preference(description = "A. Visitor Comments", visibility = PreferenceVisibility.USER)
+ at Preference(description = "Core: Visitor Comments", visibility = PreferenceVisibility.USER)
public class CommentsPreferences extends PreferenceSupport implements Serializable {
public String getCurrentUserVariable() { return "currentUser"; }
@@ -22,5 +22,5 @@
public void refreshProperties() { super.refreshProperties(); }
@Preference(description = "01. List comments ascending by date (or descending)", visibility = PreferenceVisibility.USER)
- private boolean listAscending;
+ private Boolean listAscending;
}
More information about the jboss-cvs-commits
mailing list