pvollenweider 2005/03/03 15:55:10 CET
Modified files: (Branch: JAHIA-4-1-BRANCH)
etc/struts corporateportal-validation.xml
metadata/war web.xml
var/shared_templates corporate_portal_templates.jar
Log:
Add box validation (non empty title) and for people and projects templates.
Revision Changes Path
1.1.2.2 +40 -15 jahia/etc/struts/corporateportal-validation.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/etc/struts/corporateportal-validation.xml.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.41.2.3.2.2 +15 -15 jahia/metadata/war/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/metadata/war/web.xml.diff?r1=1.41.2.3.2.1&r2=1.41.2.3.2.2&f=h
1.104.2.23.2.1 +713 -847
jahia/var/shared_templates/corporate_portal_templates.jar
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/var/shared_templates/corporate_portal_templates.jar.diff?r1=1.104.2.23&r2=1.104.2.23.2.1&f=h
Index: corporateportal-validation.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/etc/struts/Attic/corporateportal-validation.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- corporateportal-validation.xml 15 Feb 2005 16:46:51 -0000 1.1.2.1
+++ corporateportal-validation.xml 3 Mar 2005 14:55:06 -0000 1.1.2.2
@@ -1,20 +1,45 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE form-validation
- PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules
Configuration 1.1.3//EN"
+ PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules
Configuration 1.1.3//EN"
"http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd";>
<form-validation>
- <formset>
- <form name="peopleBean">
- <field property="directoryPeopleFirstName"
depends="required">
- <arg0 key="First name" resource="false"/>
- </field>
- <field property="directoryPeopleLastName"
depends="required">
- <arg0 key="Last name" resource="false"/>
- </field>
- <field property="directoryPeopleEmail"
depends="required,email">
- <arg0 key="Email" resource="false"/>
- </field>
- </form>
- </formset>
-</form-validation>
\ No newline at end of file
+ <formset>
+ <form name="boxValidationBean">
+ <field property="boxTitle1" depends="required">
+ <arg0 key="Title" resource="false"/>
+ </field>
+ <field property="boxTitle2" depends="required">
+ <arg0 key="Title" resource="false"/>
+ </field>
+ <field property="boxTitle3" depends="required">
+ <arg0 key="Title" resource="false"/>
+ </field>
+ <field property="boxTitlemain_1" depends="required">
+ <arg0 key="Title" resource="false"/>
+ </field>
+ <field property="boxTitlemain_1" depends="required">
+ <arg0 key="Title" resource="false"/>
+ </field>
+ <field property="boxTitleleft" depends="required">
+ <arg0 key="Title" resource="false"/>
+ </field>
+ <field property="boxTitleright" depends="required">
+ <arg0 key="Title" resource="false"/>
+ </field>
+ </form>
+ <form name="projectValidationBean">
+ <field property="directoryProjectName" depends="required">
+ <arg0 key="Name" resource="false"/>
+ </field>
+ </form>
+ <form name="peopleValidationBean">
+ <field property="directoryPeopleFirstName" depends="required">
+ <arg0 key="First Name" resource="false"/>
+ </field>
+ <field property="directoryPeopleLastName" depends="required">
+ <arg0 key="Last Name" resource="false"/>
+ </field>
+ </form>
+ </formset>
+</form-validation>
\ No newline at end of file
Index: web.xml
===================================================================
RCS file: /home/cvs/repository/jahia/metadata/war/Attic/web.xml,v
retrieving revision 1.41.2.3.2.1
retrieving revision 1.41.2.3.2.2
diff -u -r1.41.2.3.2.1 -r1.41.2.3.2.2
--- web.xml 15 Feb 2005 16:46:53 -0000 1.41.2.3.2.1
+++ web.xml 3 Mar 2005 14:55:07 -0000 1.41.2.3.2.2
@@ -54,9 +54,9 @@
<param-value>1.3 <= x < 1.5</param-value>
</init-param>
<init-param>
- <!-- This parameter specifies the default mapping pattern that
+ <!-- This parameter specifies the default mapping pattern that
Jahia should use when generating URLs or detecting Jahia
- content URLs. If you change anything to the mappings you
+ content URLs. If you change anything to the mappings you
need to change this too.
-->
<param-name>defaultMappingPattern</param-name>
@@ -78,10 +78,10 @@
</init-param>
<init-param>
<param-name>config</param-name>
- <param-value>/WEB-INF/etc/struts/struts-config.xml</param-value>
- <!-- replace the above line with this one if you want to test the
- validation example
<param-value>/WEB-INF/etc/struts/struts-config.xml,/WEB-INF/etc/struts/struts-config-corporateportal.xml</param-value>
+ <!-- replace the above line with this one if you want unactive the
+ validation example
+ <param-value>/WEB-INF/etc/struts/struts-config.xml</param-value>
-->
</init-param>
<!-- commented out because we did provide any resource file yet -->
@@ -92,15 +92,15 @@
<!-- lucene system property parameter -->
<!--
- Lucene Property System Property
Default Value
- mergeFactor org.apache.lucene.mergeFactor
10
- minMergeDocs org.apache.lucene.minMergeDocs
10
- maxMergeDocs org.apache.lucene.maxMergeDocs
Integer.MAX_VALUE
- maxFieldLength org.apache.lucene.maxFieldLength
10000
- COMMIT_LOCK_TIMEOUT org.apache.lucene.commitLockTimeout
10000 ms
- WRITE_LOCK_TIMEOUT org.apache.lucene.writeLockTimeout
1000 ms
- maxClauseCount org.apache.lucene.maxClauseCount
1024
- lockDir org.apache.lucene.lockDir
the value of java.io.tmpdir system property
+ Lucene Property System Property
Default Value
+ mergeFactor org.apache.lucene.mergeFactor
10
+ minMergeDocs org.apache.lucene.minMergeDocs
10
+ maxMergeDocs org.apache.lucene.maxMergeDocs
Integer.MAX_VALUE
+ maxFieldLength org.apache.lucene.maxFieldLength
10000
+ COMMIT_LOCK_TIMEOUT org.apache.lucene.commitLockTimeout
10000 ms
+ WRITE_LOCK_TIMEOUT org.apache.lucene.writeLockTimeout
1000 ms
+ maxClauseCount org.apache.lucene.maxClauseCount
1024
+ lockDir org.apache.lucene.lockDir
the value of java.io.tmpdir system property
-->
<init-param>
<param-name>org.apache.lucene.mergeFactor</param-name>
@@ -134,7 +134,7 @@
<param-name>org.apache.lucene.backgroundIndexing.priority</param-name>
<param-value>3</param-value> <!-- define the priority of
indexation in background 1 = Thread.MIN_PRIORITY, 5 = Thread.NORM_PRIORITY, 10
= Thread.MAX_PRIORITY -->
</init-param>
-
+
<load-on-startup>5</load-on-startup>
</servlet>
Index: corporate_portal_templates.jar
===================================================================
<<Binary file>>
