Author: agilliland
Date: Mon May 21 10:23:19 2007
New Revision: 540205
URL: http://svn.apache.org/viewvc?view=rev&rev=540205
Log:
struts2 validation for a number of actions.
Added:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd-validation.xml
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit-validation.xml
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryAdd-validation.xml
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryEdit-validation.xml
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryEdit-validation.xml
roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderAdd-validation.xml
roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderEdit-validation.xml
roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfig-validation.xml
Modified:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd.java
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit.java
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryAdd.java
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryEdit.java
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryAdd-validation.xml
roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderAdd.java
roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderEdit.java
roller/trunk/src/org/apache/roller/ui/authoring/struts2/TemplateEdit.java
roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfig.java
Added:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd-validation.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd-validation.xml?view=auto&rev=540205
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd-validation.xml
(added)
+++
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd-validation.xml
Mon May 21 10:23:19 2007
@@ -0,0 +1,65 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<validators>
+
+ <field name="bean.name">
+ <field-validator type="requiredstring">
+ <message key="Bookmark.error.nameNull">unspecified key</message>
+ </field-validator>
+
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Bookmark.error.nameSize">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.description">
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Bookmark.error.descriptionSize">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.url">
+ <field-validator type="requiredstring">
+ <message key="Bookmark.error.urlNull">unspecified key</message>
+ </field-validator>
+
+ <field-validator type="url">
+ <message key="Bookmark.error.urlBad">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.weight">
+ <field-validator type="required">
+ <message key="Bookmark.error.weightNull">unspecified key</message>
+ </field-validator>
+
+ <field-validator type="int">
+ <message key="Bookmark.error.weightNotInt">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.priority">
+ <field-validator type="required">
+ <message key="Bookmark.error.priorityNull">unspecified
key</message>
+ </field-validator>
+
+ <field-validator type="int">
+ <message key="Bookmark.error.priorityNotInt">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.image">
+ <field-validator type="url">
+ <message key="Bookmark.error.imageBad">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.feedUrl">
+ <field-validator type="url">
+ <message key="Bookmark.error.feedUrlBad">unspecified key</message>
+ </field-validator>
+ </field>
+
+</validators>
\ No newline at end of file
Modified:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd.java?view=diff&rev=540205&r1=540204&r2=540205
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkAdd.java
Mon May 21 10:23:19 2007
@@ -31,6 +31,7 @@
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.ui.core.util.struts2.UIAction;
import org.apache.roller.util.cache.CacheManager;
+import org.apache.struts2.interceptor.validation.SkipValidation;
/**
@@ -74,6 +75,7 @@
}
+ @SkipValidation
public String execute() {
if(getFolder() == null) {
Added:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit-validation.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit-validation.xml?view=auto&rev=540205
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit-validation.xml
(added)
+++
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit-validation.xml
Mon May 21 10:23:19 2007
@@ -0,0 +1,65 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<validators>
+
+ <field name="bean.name">
+ <field-validator type="requiredstring">
+ <message key="Bookmark.error.nameNull">unspecified key</message>
+ </field-validator>
+
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Bookmark.error.nameSize">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.description">
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Bookmark.error.descriptionSize">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.url">
+ <field-validator type="requiredstring">
+ <message key="Bookmark.error.urlNull">unspecified key</message>
+ </field-validator>
+
+ <field-validator type="url">
+ <message key="Bookmark.error.urlBad">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.weight">
+ <field-validator type="required">
+ <message key="Bookmark.error.weightNull">unspecified key</message>
+ </field-validator>
+
+ <field-validator type="int">
+ <message key="Bookmark.error.weightNotInt">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.priority">
+ <field-validator type="required">
+ <message key="Bookmark.error.priorityNull">unspecified
key</message>
+ </field-validator>
+
+ <field-validator type="int">
+ <message key="Bookmark.error.priorityNotInt">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.image">
+ <field-validator type="url">
+ <message key="Bookmark.error.imageBad">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.feedUrl">
+ <field-validator type="url">
+ <message key="Bookmark.error.feedUrlBad">unspecified key</message>
+ </field-validator>
+ </field>
+
+</validators>
\ No newline at end of file
Modified:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit.java?view=diff&rev=540205&r1=540204&r2=540205
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/authoring/struts2/BookmarkEdit.java
Mon May 21 10:23:19 2007
@@ -30,6 +30,7 @@
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.ui.core.util.struts2.UIAction;
import org.apache.roller.util.cache.CacheManager;
+import org.apache.struts2.interceptor.validation.SkipValidation;
/**
@@ -70,6 +71,7 @@
}
+ @SkipValidation
public String execute() {
if(getBookmark() == null) {
Added:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryAdd-validation.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryAdd-validation.xml?view=auto&rev=540205
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryAdd-validation.xml
(added)
+++
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryAdd-validation.xml
Mon May 21 10:23:19 2007
@@ -0,0 +1,29 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<validators>
+
+ <field name="bean.name">
+ <field-validator type="requiredstring">
+ <message key="Category.error.nameNull">unspecified key</message>
+ </field-validator>
+
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Category.error.nameSize">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.description">
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Category.error.descriptionSize">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.image">
+ <field-validator type="url">
+ <message key="Category.error.imageBad">unspecified key</message>
+ </field-validator>
+ </field>
+
+</validators>
\ No newline at end of file
Modified:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryAdd.java?view=diff&rev=540205&r1=540204&r2=540205
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryAdd.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryAdd.java
Mon May 21 10:23:19 2007
@@ -22,13 +22,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.business.BookmarkManager;
import org.apache.roller.business.RollerFactory;
import org.apache.roller.business.WeblogManager;
import org.apache.roller.pojos.WeblogCategoryData;
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.ui.core.util.struts2.UIAction;
import org.apache.roller.util.cache.CacheManager;
+import org.apache.struts2.interceptor.validation.SkipValidation;
/**
@@ -76,6 +76,7 @@
/**
* Show category form.
*/
+ @SkipValidation
public String execute() {
if(getCategory() == null) {
Added:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryEdit-validation.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryEdit-validation.xml?view=auto&rev=540205
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryEdit-validation.xml
(added)
+++
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryEdit-validation.xml
Mon May 21 10:23:19 2007
@@ -0,0 +1,29 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<validators>
+
+ <field name="bean.name">
+ <field-validator type="requiredstring">
+ <message key="Category.error.nameNull">unspecified key</message>
+ </field-validator>
+
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Category.error.nameSize">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.description">
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Category.error.descriptionSize">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.image">
+ <field-validator type="url">
+ <message key="Category.error.imageBad">unspecified key</message>
+ </field-validator>
+ </field>
+
+</validators>
\ No newline at end of file
Modified:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryEdit.java?view=diff&rev=540205&r1=540204&r2=540205
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryEdit.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/authoring/struts2/CategoryEdit.java
Mon May 21 10:23:19 2007
@@ -28,6 +28,7 @@
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.ui.core.util.struts2.UIAction;
import org.apache.roller.util.cache.CacheManager;
+import org.apache.struts2.interceptor.validation.SkipValidation;
/**
@@ -72,6 +73,7 @@
/**
* Show category form.
*/
+ @SkipValidation
public String execute() {
if(getCategory() == null) {
@@ -133,9 +135,11 @@
// name is required, has max length, no html
// make sure new name is not a duplicate of an existing category
- WeblogCategoryData parent = getCategory().getParent();
- if(parent != null && parent.hasCategory(getBean().getName())) {
- addError("categoryForm.error.duplicateName", getBean().getName());
+ if(!getCategory().getName().equals(getBean().getName())) {
+ WeblogCategoryData parent = getCategory().getParent();
+ if(parent != null && parent.hasCategory(getBean().getName())) {
+ addError("categoryForm.error.duplicateName",
getBean().getName());
+ }
}
}
Modified:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryAdd-validation.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryAdd-validation.xml?view=diff&rev=540205&r1=540204&r2=540205
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryAdd-validation.xml
(original)
+++
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryAdd-validation.xml
Mon May 21 10:23:19 2007
@@ -4,34 +4,29 @@
<field name="bean.title">
<field-validator type="requiredstring">
- <param name="trim">true</param>
<message key="weblogEdit.error.incompleteEntry">unspecified
key</message>
</field-validator>
<field-validator type="stringlength">
<param name="maxLength">255</param>
- <param name="trim">true</param>
<message key="EntryAdd.error.handleSize">unspecified key</message>
</field-validator>
</field>
<field name="bean.locale">
<field-validator type="requiredstring">
- <param name="trim">true</param>
<message key="EntryAdd.error.titleNull">unspecified key</message>
</field-validator>
</field>
<field name="bean.categoryId">
<field-validator type="requiredstring">
- <param name="trim">true</param>
<message key="EntryAdd.error.titleNull">unspecified key</message>
</field-validator>
</field>
<field name="bean.text">
<field-validator type="requiredstring">
- <param name="trim">true</param>
<message key="EntryAdd.error.titleNull">unspecified key</message>
</field-validator>
</field>
Added:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryEdit-validation.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryEdit-validation.xml?view=auto&rev=540205
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryEdit-validation.xml
(added)
+++
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryEdit-validation.xml
Mon May 21 10:23:19 2007
@@ -0,0 +1,34 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<validators>
+
+ <field name="bean.title">
+ <field-validator type="requiredstring">
+ <message key="weblogEdit.error.incompleteEntry">unspecified
key</message>
+ </field-validator>
+
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="EntryAdd.error.handleSize">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.locale">
+ <field-validator type="requiredstring">
+ <message key="EntryAdd.error.titleNull">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.categoryId">
+ <field-validator type="requiredstring">
+ <message key="EntryAdd.error.titleNull">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.text">
+ <field-validator type="requiredstring">
+ <message key="EntryAdd.error.titleNull">unspecified key</message>
+ </field-validator>
+ </field>
+
+</validators>
\ No newline at end of file
Added:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderAdd-validation.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderAdd-validation.xml?view=auto&rev=540205
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderAdd-validation.xml
(added)
+++
roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderAdd-validation.xml
Mon May 21 10:23:19 2007
@@ -0,0 +1,23 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<validators>
+
+ <field name="bean.name">
+ <field-validator type="requiredstring">
+ <message key="Folder.error.nameNull">unspecified key</message>
+ </field-validator>
+
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Folder.error.nameSize">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.description">
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Folder.error.descriptionSize">unspecified
key</message>
+ </field-validator>
+ </field>
+
+</validators>
\ No newline at end of file
Modified: roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderAdd.java?view=diff&rev=540205&r1=540204&r2=540205
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderAdd.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderAdd.java Mon
May 21 10:23:19 2007
@@ -28,6 +28,7 @@
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.ui.core.util.struts2.UIAction;
import org.apache.roller.util.cache.CacheManager;
+import org.apache.struts2.interceptor.validation.SkipValidation;
/**
@@ -71,6 +72,7 @@
}
+ @SkipValidation
public String execute() {
if(getFolder() == null) {
Added:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderEdit-validation.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderEdit-validation.xml?view=auto&rev=540205
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderEdit-validation.xml
(added)
+++
roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderEdit-validation.xml
Mon May 21 10:23:19 2007
@@ -0,0 +1,23 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<validators>
+
+ <field name="bean.name">
+ <field-validator type="requiredstring">
+ <message key="Folder.error.nameNull">unspecified key</message>
+ </field-validator>
+
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Folder.error.nameSize">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.description">
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="Folder.error.descriptionSize">unspecified
key</message>
+ </field-validator>
+ </field>
+
+</validators>
\ No newline at end of file
Modified:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderEdit.java?view=diff&rev=540205&r1=540204&r2=540205
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderEdit.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/authoring/struts2/FolderEdit.java Mon
May 21 10:23:19 2007
@@ -28,6 +28,7 @@
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.ui.core.util.struts2.UIAction;
import org.apache.roller.util.cache.CacheManager;
+import org.apache.struts2.interceptor.validation.SkipValidation;
/**
@@ -73,6 +74,7 @@
/**
* Show folder edit page.
*/
+ @SkipValidation
public String execute() {
if(getFolder() == null) {
@@ -134,9 +136,11 @@
// name is required, has max length, no html
// make sure new name is not a duplicate of an existing folder
- FolderData parent = getFolder().getParent();
- if(parent != null && parent.hasFolder(getBean().getName())) {
- addError("folderForm.error.duplicateName", getBean().getName());
+ if(!getFolder().getName().equals(getBean().getName())) {
+ FolderData parent = getFolder().getParent();
+ if(parent != null && parent.hasFolder(getBean().getName())) {
+ addError("folderForm.error.duplicateName",
getBean().getName());
+ }
}
}
Modified:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/TemplateEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/TemplateEdit.java?view=diff&rev=540205&r1=540204&r2=540205
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/authoring/struts2/TemplateEdit.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/authoring/struts2/TemplateEdit.java
Mon May 21 10:23:19 2007
@@ -54,7 +54,7 @@
public TemplateEdit() {
- this.actionName = "template";
+ this.actionName = "templateEdit";
this.desiredMenu = "editor";
this.pageTitle = "pagesForm.title";
}
Added:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfig-validation.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfig-validation.xml?view=auto&rev=540205
==============================================================================
---
roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfig-validation.xml
(added)
+++
roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfig-validation.xml
Mon May 21 10:23:19 2007
@@ -0,0 +1,65 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+<validators>
+
+ <field name="bean.name">
+ <field-validator type="requiredstring">
+ <message key="WeblogConfig.error.nameNull">unspecified
key</message>
+ </field-validator>
+
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="WeblogConfig.error.nameSize">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.description">
+ <field-validator type="stringlength">
+ <param name="maxLength">255</param>
+ <message key="WeblogConfig.error.descriptionSize">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.url">
+ <field-validator type="requiredstring">
+ <message key="WeblogConfig.error.urlNull">unspecified key</message>
+ </field-validator>
+
+ <field-validator type="url">
+ <message key="WeblogConfig.error.urlBad">unspecified key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.weight">
+ <field-validator type="required">
+ <message key="WeblogConfig.error.weightNull">unspecified
key</message>
+ </field-validator>
+
+ <field-validator type="int">
+ <message key="WeblogConfig.error.weightNotInt">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.priority">
+ <field-validator type="required">
+ <message key="WeblogConfig.error.priorityNull">unspecified
key</message>
+ </field-validator>
+
+ <field-validator type="int">
+ <message key="WeblogConfig.error.priorityNotInt">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.image">
+ <field-validator type="url">
+ <message key="WeblogConfig.error.imageBad">unspecified
key</message>
+ </field-validator>
+ </field>
+
+ <field name="bean.feedUrl">
+ <field-validator type="url">
+ <message key="WeblogConfig.error.feedUrlBad">unspecified
key</message>
+ </field-validator>
+ </field>
+
+</validators>
\ No newline at end of file
Modified:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfig.java?view=diff&rev=540205&r1=540204&r2=540205
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfig.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/authoring/struts2/WeblogConfig.java
Mon May 21 10:23:19 2007
@@ -35,10 +35,10 @@
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.ui.core.plugins.UIPluginManager;
-import org.apache.roller.ui.core.util.struts2.KeyValueObject;
import org.apache.roller.ui.core.util.struts2.UIAction;
import org.apache.roller.util.Blacklist;
import org.apache.roller.util.cache.CacheManager;
+import org.apache.struts2.interceptor.validation.SkipValidation;
/**
@@ -106,6 +106,7 @@
}
+ @SkipValidation
public String execute() {
// load bean with data from weblog
