Scarab commit: svn commit: r11017 - trunk: . build src/java/org/tigris/scarab/om src/sql src/sql/upgrade src/webapp/WEB-INF/templates/screens/admin
[email protected] Wed, 5 May 2010 08:45:15 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: jhoech
Date: 2010-05-05 08:45:15-0700
New Revision: 11017
Added:
trunk/src/sql/upgrade/upgrade-0.22-global-booleans-to-long-form.sql
- copied unchanged from r11014, /branches/release/0.22/src/sql/upgrade/upgrade-0.22-global-booleans-to-long-form.sql
Modified:
trunk/ (props changed)
trunk/build/build-torque.xml
trunk/properties.xsl (props changed)
trunk/src/java/org/tigris/scarab/om/GlobalParameterManager.java
trunk/src/sql/scarab-required-data.sql
trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm
Log:
MRG - Merged revision from b22-release branch starting from last revision of merge: 11007-11016. Skipped: 11006 + 11008 (torque update)
Modified: trunk/build/build-torque.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/build/build-torque.xml?view=diff&pathrev=11017&r1=11016&r2=11017
==============================================================================
--- trunk/build/build-torque.xml (original)
+++ trunk/build/build-torque.xml 2010-05-05 08:45:15-0700
@@ -29,44 +29,34 @@
-->
<!--
- For us to load the default.properties from the classpath, we need to bootstrap.
- To know the right lib.dir for the torque-classpath, we need to manually
- figure out torque.lib.dir, but to do that, we need to manually figure
- out torque.contextProperties and load that so that any old configurations
- still work propertly. Then we can go on and do the rest of the mappings via
- old.properties.
+ Default properties.
+
+ build.properties will be used as additional property resource,
+ if no other value for torque.contextProperties is given.
-->
<property name="build.properties" value="build.properties"/>
<property name="torque.contextProperties" value="${build.properties}"/>
<property file="${torque.contextProperties}"/>
<property name="lib.dir" value="lib"/>
- <property name="torque.lib.dir" value="${lib.dir}"/>
- <property name="torque.jar" value="torque-gen-3.3-RC2.jar"/>
<!--
Build the classpath used by all torque ant tasks.
First, defines the template/generator override directories/jars based on the
torque.override.dir build property. If this property is not set, use
- the torque.lib.dir as a default to keep ant happy.
+ the lib.dir as a default to keep ant happy.
Note: To prevent version conflicts in the default case, jars being
overridden need to end in "override.jar".
- Next, specifically point to each file we're including to avoid version
- conflicts in the case of the torque.lib.dir being something like lib.repo.
- However, we still need to pull in the user's database driver and since we
- don't know which jar that will be, after we've got all of our specific,
- version-safe jars, do a general inclusion of the torque.lib.dir to catch
- any drivers. In the maven-built versions, ${torque.jar} is in the working
- directory.
+ Next, do a general inclusion of the lib.dir to catch any drivers.
-->
<condition property="valid.override.directory"
value="${torque.override.dir}">
<isset property="torque.override.dir" />
</condition>
<condition property="valid.override.directory"
- value="${torque.lib.dir}">
+ value="${lib.dir}">
<not>
<isset property="torque.override.dir" />
</not>
@@ -77,15 +67,7 @@
<fileset dir="${valid.override.directory}">
<include name="*override.jar"/>
</fileset>
- <pathelement path="${torque.jar}" />
- <fileset dir="${torque.lib.dir}">
- <include name="**/commons-collections-3.1.jar"/>
- <include name="**/commons-lang-2.1.jar"/>
- <include name="**/commons-logging-1.0.4.jar"/>
- <include name="**/velocity-1.3.1.jar"/>
- <include name="**/village-2.0.jar"/>
- <include name="**/xercesImpl-2.6.2.jar"/>
- <include name="**/xml-apis-2.0.2.jar"/>
+ <fileset dir="${lib.dir}">
<include name="**/*.jar"/>
</fileset>
</path>
Modified: trunk/src/java/org/tigris/scarab/om/GlobalParameterManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/GlobalParameterManager.java?view=diff&pathrev=11017&r1=11016&r2=11017
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/GlobalParameterManager.java (original)
+++ trunk/src/java/org/tigris/scarab/om/GlobalParameterManager.java 2010-05-05 08:45:15-0700
@@ -86,7 +86,7 @@
private static boolean toBoolean(String booleanValue)
{
return(
- booleanValue.equalsIgnoreCase("T")
+ booleanValue.equalsIgnoreCase("T") //Reading simple characters as boolean, is kept for backwards compatibility only.
|| booleanValue.equalsIgnoreCase("TRUE")
);
}
@@ -322,7 +322,7 @@
public static boolean getBooleanFromHierarchy(String name, Module module, boolean def)
throws TorqueException
{
- String defAsString = (def)? "T":"F";
+ String defAsString = (def)? "TRUE":"FALSE";
return toBoolean(getStringFromHierarchy(name, module, defAsString ));
}
@@ -330,13 +330,13 @@
public static void setBoolean(String name, boolean value)
throws TorqueException
{
- setString(name, (value ? "T" : "F"));
+ setString(name, (value ? "TRUE" : "FALSE"));
}
public static void setBoolean(String name, Module module, boolean value)
throws TorqueException
{
- setString(name, module, (value ? "T" : "F"));
+ setString(name, module, (value ? "TRUE" : "FALSE"));
}
/**
Modified: trunk/src/sql/scarab-required-data.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/scarab-required-data.sql?view=diff&pathrev=11017&r1=11016&r2=11017
==============================================================================
--- trunk/src/sql/scarab-required-data.sql (original)
+++ trunk/src/sql/scarab-required-data.sql 2010-05-05 08:45:15-0700
@@ -121,6 +121,6 @@
-- global application parameters, we start off needing to be localized
insert into SCARAB_GLOBAL_PARAMETER (PARAMETER_ID, NAME, VALUE)
values (1, 'db-l10n-state', 'pre-l10n');
-insert into SCARAB_GLOBAL_PARAMETER values (2, 'email-enabled', 'T', NULL);
-insert into SCARAB_GLOBAL_PARAMETER values (3, 'email-include-issue-details', 'T', NULL);
-insert into SCARAB_GLOBAL_PARAMETER values (4, 'email-allow-module-overrides', 'T', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (2, 'email-enabled', 'TRUE', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (3, 'email-include-issue-details', 'TRUE', NULL);
+insert into SCARAB_GLOBAL_PARAMETER values (4, 'email-allow-module-overrides', 'TRUE', NULL);
Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm?view=diff&pathrev=11017&r1=11016&r2=11017
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm 2010-05-05 08:45:15-0700
@@ -232,7 +232,7 @@
selectedObject = document.getElementById(selector);
val = selectedObject.options[selectedObject.selectedIndex].value;
cb = document.getElementById(checkmarker);
- if(val == "F")
+ if(val == "FALSE")
{
cb.disabled=false;
return;
@@ -256,8 +256,8 @@
#if (!$isGlobal)
<option value="" #if ($inherited) selected #end>$l10n.Default</option>
#end
- <option value="T" #if (!$inherited && $selected) selected #end>$l10n.Yes</option>
- <option value="F" #if (!$inherited && !$selected) selected #end>$l10n.No</option>
+ <option value="TRUE" #if (!$inherited && $selected) selected #end>$l10n.Yes</option>
+ <option value="FALSE" #if (!$inherited && !$selected) selected #end>$l10n.No</option>
</select>
#if (!$isGlobal) $l10n.ReasonFieldRequiredExplained #end
</td>
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2603496