Scarab commit: svn commit: r10945 - branches/release/0.22: . build src/conf/conf

Author: jhoech
Date: 2010-03-05 06:13:11-0800
New Revision: 10945

Modified:
   branches/release/0.22/build/build.xml
   branches/release/0.22/scarab_properties.xml
   branches/release/0.22/src/conf/conf/componentConfiguration.xml
   branches/release/0.22/src/conf/conf/intake.xml

Log:
FIX - SCB3033 Ant build filters configuration files for SCARAB_FILE_MAX_SIZE during build, to replace this by value from scarab.file.max.size. Hence the maximum file size for attachments cane be set by property for build.

Modified: branches/release/0.22/build/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/build/build.xml?view=diff&pathrev=10945&r1=10944&r2=10945
==============================================================================
--- branches/release/0.22/build/build.xml	(original)
+++ branches/release/0.22/build/build.xml	2010-03-05 06:13:11-0800
@@ -163,6 +163,7 @@
                  <filter token="SCARAB_MODULE_CODE_LENGTH" value="${scarab.module.code.length}"/>
                  <filter token="VERSION" value="${version}"/>
                  <filter token="BUILD_DATE" value="${DSTAMP}${TSTAMP}"/>
+                 <filter token="SCARAB_FILE_MAX_SIZE" value="${scarab.file.max.size}"/>
              </filterset>
         </copy>
 

Modified: branches/release/0.22/scarab_properties.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/scarab_properties.xml?view=diff&pathrev=10945&r1=10944&r2=10945
==============================================================================
--- branches/release/0.22/scarab_properties.xml	(original)
+++ branches/release/0.22/scarab_properties.xml	2010-03-05 06:13:11-0800
@@ -1575,8 +1575,8 @@
     <property>
       <name>scarab.file.max.size</name>
       <default>157286400</default>
-      <comment/>
-      <type>Runtime</type>
+      <comment>Maximum file size for file uploads/attachments.</comment>
+      <type>Build</type>
        <customization modification="optional">advanced</customization>
       <file/>
     </property>

Modified: branches/release/0.22/src/conf/conf/componentConfiguration.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/conf/conf/componentConfiguration.xml?view=diff&pathrev=10945&r1=10944&r2=10945
==============================================================================
--- branches/release/0.22/src/conf/conf/componentConfiguration.xml	(original)
+++ branches/release/0.22/src/conf/conf/componentConfiguration.xml	2010-03-05 06:13:11-0800
@@ -5,7 +5,7 @@
     <!-- Torque Component initialized from the Turbine runtime properties -->
     <torque />
     <mimetype mimetypes="/WEB-INF/conf/mime.types" />
-    <upload repository="WEB-INF" sizeMax="157286400"
+    <upload repository="WEB-INF" sizeMax="@SCARAB_FILE_MAX_SIZE@"
         sizeThreshold="8192" />
     <parser />
 

Modified: branches/release/0.22/src/conf/conf/intake.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/conf/conf/intake.xml?view=diff&pathrev=10945&r1=10944&r2=10945
==============================================================================
--- branches/release/0.22/src/conf/conf/intake.xml	(original)
+++ branches/release/0.22/src/conf/conf/intake.xml	2010-03-05 06:13:11-0800
@@ -454,7 +454,7 @@
         <required-message>intake_FieldRequired</required-message>
     </field>
     <field name="File" key="d" type="FileItem">
-        <rule name="maxLength" value="157286400">intake_MaxFileUploadSizeExceeded</rule>
+        <rule name="maxLength" value="@SCARAB_FILE_MAX_SIZE@">intake_MaxFileUploadSizeExceeded</rule>
         <required-message>intake_NoFile</required-message>
     </field>
     <!-- two different fields are used because there is an 'other' field -->

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2455448