Author: thomas.heute(a)jboss.com
Date: 2010-04-09 06:09:44 -0400 (Fri, 09 Apr 2010)
New Revision: 2552
Modified:
portal/branches/EPP_5_0_Branch/packaging/profiles.xml
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties
Log:
JBEPP-299 Change message when input name for gadget start by number
Modified: portal/branches/EPP_5_0_Branch/packaging/profiles.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/packaging/profiles.xml 2010-04-09 10:06:24 UTC (rev
2551)
+++ portal/branches/EPP_5_0_Branch/packaging/profiles.xml 2010-04-09 10:09:44 UTC (rev
2552)
@@ -29,7 +29,7 @@
ex: On Windows 'c:/AS'
ex: On Linux '/home/user/AS'
-->
-
<exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies>
+
<exo.projects.directory.dependencies>/tmp/jboss-eap-5.0</exo.projects.directory.dependencies>
<!--
If you want that the server is deployed always at the same place (not in
packaging/pkg/target/<server> dir)
@@ -41,11 +41,11 @@
<!--
Replace with the name of the directory containing Tomcat 6
-->
-
<exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version>
+ <exo.projects.app.tomcat.version></exo.projects.app.tomcat.version>
<!--
Replace with the name of the directory containing JBoss AS 5.1
-->
-
<exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>
+
<exo.projects.app.jboss.version>jboss-as</exo.projects.app.jboss.version>
</properties>
</profile>
</profiles>
Modified:
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java
===================================================================
---
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2010-04-09
10:06:24 UTC (rev 2551)
+++
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2010-04-09
10:09:44 UTC (rev 2552)
@@ -47,6 +47,8 @@
import org.exoplatform.webui.form.validator.ExpressionValidator;
import org.exoplatform.webui.form.validator.IdentifierValidator;
import org.exoplatform.webui.form.validator.MandatoryValidator;
+import org.exoplatform.webui.form.validator.ResourceValidator;
+import org.exoplatform.webui.form.validator.StringLengthValidator;
import org.exoplatform.webui.form.validator.Validator;
import java.io.Serializable;
@@ -79,8 +81,10 @@
Param param = initParams.getParam("SampleGadget");
WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
String sample = (String)param.getMapGroovyObject(context);
- addUIFormInput(new UIFormStringInput(FIELD_NAME, null,
null).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class,
"^[\\p{L}][\\p{ASCII}]+$",
- "UIGadgetEditor.msg.Invalid"));
+ addUIFormInput(new UIFormStringInput(FIELD_NAME, FIELD_NAME,
null).addValidator(MandatoryValidator.class)
+ .addValidator(StringLengthValidator.class, 2, 50)
+ .addValidator(ResourceValidator.class)
+ .addValidator(ExpressionValidator.class,
"^[\\p{L}][\\p{L}._\\-\\d]+$","UIGadgetEditor.msg.Invalid-firstChar"));
addUIFormInput(new UIFormTextAreaInput(FIELD_SOURCE, FIELD_SOURCE,
sample).addValidator(MandatoryValidator.class)
.addValidator(GadgetSpecValidator.class));
}
Modified:
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties
===================================================================
---
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-04-09
10:06:24 UTC (rev 2551)
+++
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-04-09
10:09:44 UTC (rev 2552)
@@ -145,7 +145,7 @@
UIGadgetEditor.action.Cancel=#{word.cancel}
UIGadgetEditor.msg.invalidSpec=This source is invalid gadget specification.
UIGadgetEditor.gadget.msg.gadgetIsExist=This name already exists, please enter a
different name.
-UIGadgetEditor.msg.Invalid=The "{0}" field must not contains special
characters.
+UIGadgetEditor.msg.Invalid-firstChar=The "{0}" field must start with a
character.
##package org.exoplatform.organization.webui.component.UIListPermissionSelector
UIListPermissionSelector.header.groupId=Group
UIListPermissionSelector.header.membership=Membership
Show replies by date