Merged V2.1 to HEAD

6295, 6296: EHCache patch on 1.3.0 and related classpath fixes
   6300: WCM-509 - Usernames with '@'
   6301: FacesHelper.makeLegalId()
   6302: Portlet fixes to remove hardcoded "Company Home" string
   6305: Fix for AWC-1440 - Potential NullPointerException in workflow history
   6306: Fix to error message when incorrect parameters are passed to number range constraint


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 12:33:37 +00:00
parent 5f5a4ac052
commit 9b1f563ebf
2 changed files with 13 additions and 14 deletions

View File

@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="source/java"/> <classpathentry kind="src" path="source/java"/>
<classpathentry kind="src" path="config"/> <classpathentry kind="src" path="config"/>
<classpathentry kind="src" path="source/test-resources"/> <classpathentry kind="src" path="source/test-resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/Core"/> <classpathentry kind="src" path="/Core"/>
<classpathentry kind="src" path="/3rd Party"/> <classpathentry kind="src" path="/3rd Party"/>
<classpathentry combineaccessrules="false" kind="src" path="/MBean"/> <classpathentry combineaccessrules="false" kind="src" path="/MBean"/>
<classpathentry combineaccessrules="false" kind="src" path="/Deployment"/> <classpathentry combineaccessrules="false" kind="src" path="/Deployment"/>
<classpathentry kind="lib" path="/3rd Party/lib/ehcache-1.3.0.jar"/> <classpathentry kind="output" path="build/classes"/>
<classpathentry kind="output" path="build/classes"/> </classpath>
</classpath>

View File

@@ -102,7 +102,7 @@ public class NumericRangeConstraint extends AbstractConstraint
{ {
if (maxValue < this.minValue) if (maxValue < this.minValue)
{ {
throw new DictionaryException(ERR_INVALID_MAX_VALUE, minValue); throw new DictionaryException(ERR_INVALID_MAX_VALUE, maxValue);
} }
this.maxValue = maxValue; this.maxValue = maxValue;
} }