Scarab commit: svn commit: r10949 - branches/release/0.22: . src/migration/org/tigris/scarab/migration/b15b16 src/migration/org/tigris/scarab/migration/b18b19 src/sql/upgrade src/test/org/tigris/scarab src/test/org/tigris/scarab/test src/test/org/tigris/scarab/tools src/test/org/tigris/scarab/util

Author: jhoech
Date: 2010-03-05 07:20:17-0800
New Revision: 10949

Added:
   branches/release/0.22/src/migration/org/tigris/scarab/migration/b15b16/
      - copied from r10945, /branches/release/0.22/src/migration/org/tigris/scarab/migration/b15b16/
   branches/release/0.22/src/migration/org/tigris/scarab/migration/b15b16/DB_1_MoveIssueCreateInfo.java
      - copied unchanged from r10945, /branches/release/0.22/src/migration/org/tigris/scarab/migration/b15b16/DB_1_MoveIssueCreateInfo.java
   branches/release/0.22/src/migration/org/tigris/scarab/migration/b18b19/
      - copied from r10945, /branches/release/0.22/src/migration/org/tigris/scarab/migration/b18b19/
   branches/release/0.22/src/migration/org/tigris/scarab/migration/b18b19/MigrateProperties.java
      - copied unchanged from r10945, /branches/release/0.22/src/migration/org/tigris/scarab/migration/b18b19/MigrateProperties.java
Modified:
   branches/release/0.22/project.properties
   branches/release/0.22/scarab_properties.xml
   branches/release/0.22/src/sql/upgrade/upgrade-0.22-attributegroup-viewrole.sql   (props changed)
   branches/release/0.22/src/test/org/tigris/scarab/AllScarabTests.java   (props changed)
   branches/release/0.22/src/test/org/tigris/scarab/test/BaseTurbineTestCase.java   (props changed)
   branches/release/0.22/src/test/org/tigris/scarab/tools/MockScarabLocalizationTool.java   (props changed)
   branches/release/0.22/src/test/org/tigris/scarab/util/MockScarabLink.java   (props changed)

Log:
MIS - Reverted all last changed for migration files. Some files only have svn related property changes.

Modified: branches/release/0.22/project.properties
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/project.properties?view=diff&pathrev=10949&r1=10948&r2=10949
==============================================================================
--- branches/release/0.22/project.properties	(original)
+++ branches/release/0.22/project.properties	2010-03-05 07:20:17-0800
@@ -1380,6 +1380,29 @@
 
 
 #######################################################################
+# Section: MIGRATION
+######################################################################## 
+#  These are some default values that are required for
+#  the b18-b19 migration build target. DO NOT MODIFY THEM!
+#  
+#  Relation to ant build:
+#  ----------------------
+#  This section directly corresponds to the ant task
+#  
+#    migrate-b18-b19  
+# 
+#######################################################################
+scarab.tomcat.http.port=8080
+scarab.tomcat.shutdown.port=8005
+scarab.webapp.reloadable=true
+scarab.webapp.checkInterval=2
+scarab.welcome.file=index.html
+scarab.file.max.size=157286400
+scarab.tomcat.proxy.name=
+scarab.tomcat.proxy.port=
+
+
+#######################################################################
 # Section: PROPERTY-MAPS
 ######################################################################## 
 #  Following mappings are fixed and shall never be changed!
@@ -1746,7 +1769,6 @@
 #   deploy.dir
 #   deploy.project
 #   scarab.torque.schemas
-#   scarab.file.max.size
 #   repository.dir
 #   lib.dir
 #   src.dir
@@ -1777,7 +1799,6 @@
 # 
 
 scarab.torque.schemas=scarab-schema.xml
-scarab.file.max.size=157286400
 repository.dir=${root.dir}/www/repository
 lib.dir=${root.dir}/lib
 src.dir=${root.dir}/src

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=10949&r1=10948&r2=10949
==============================================================================
--- branches/release/0.22/scarab_properties.xml	(original)
+++ branches/release/0.22/scarab_properties.xml	2010-03-05 07:20:17-0800
@@ -1520,6 +1520,85 @@
     </group>
   </section>
 
+  <section name="MIGRATION">
+    <details>
+      These are some default values that are required for
+      the b18-b19 migration build target. DO NOT MODIFY THEM!
+      
+      Relation to ant build:
+      ----------------------
+      This section directly corresponds to the ant task
+      
+        migrate-b18-b19  
+    </details>
+
+    <property>
+      <name>scarab.tomcat.http.port</name>
+      <default>8080</default>
+      <comment/>
+      <type>Build</type>
+       <customization modification="optional">advanced</customization>
+      <file/>
+    </property>
+    <property>
+      <name>scarab.tomcat.shutdown.port</name>
+      <default>8005</default>
+      <comment/>
+      <type>Build</type>
+       <customization modification="optional">advanced</customization>
+      <file/>
+    </property>
+    <property>
+      <name>scarab.webapp.reloadable</name>
+      <default>true</default>
+      <comment/>
+      <type>Build</type>
+       <customization modification="optional">advanced</customization>
+      <file/>
+    </property>
+    <property>
+      <name>scarab.webapp.checkInterval</name>
+      <default>2</default>
+      <comment/>
+      <type>Build</type>
+       <customization modification="optional">advanced</customization>
+      <file/>
+    </property>
+    <property>
+      <name>scarab.welcome.file</name>
+      <default>index.html</default>
+      <comment/>
+      <type>Build</type>
+       <customization modification="optional">advanced</customization>
+      <file/>
+    </property>
+    <property>
+      <name>scarab.file.max.size</name>
+      <default>157286400</default>
+      <comment>Maximum file size for file uploads/attachments.</comment>
+      <type>Build</type>
+       <customization modification="optional">advanced</customization>
+      <file/>
+    </property>
+    <property>
+      <name>scarab.tomcat.proxy.name</name>
+      <default/>
+      <comment/>
+      <type>Build</type>
+       <customization modification="optional">advanced</customization>
+      <file/>
+    </property>
+    <property>
+      <name>scarab.tomcat.proxy.port</name>
+      <default/>
+      <comment/>
+      <type>Build</type>
+       <customization modification="optional">advanced</customization>
+      <file/>
+    </property>
+  </section>
+
+
   <section name="PROPERTY-MAPS">
     <details>
       Following mappings are fixed and shall never be changed!
@@ -2599,15 +2678,7 @@
         </details>
 
       </property>
-	<property>
-      <name>scarab.file.max.size</name>
-      <default>157286400</default>
-      <comment>Maximum file size for file uploads/attachments.</comment>
-      <type>Build</type>
-       <customization modification="optional">advanced</customization>
-      <file/>
-    </property>
-	  <property>
+      <property>
         <name>repository.dir</name>
         <default>${root.dir}/www/repository</default>
         <comment/>

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