tag:old.nabble.com,2006:forum-292
Nabble - Apache Commons
2009-12-01T12:27:41Z
The Commons is a Jakarta subproject focused on all aspects of reusable Java components. Jakarta Commons home is <a href="http://jakarta.apache.org/commons/" target="_top" rel="nofollow">here</a>.
tag:old.nabble.com,2006:post-26598528
svn commit: r885913 - in /commons/proper/lang/trunk/src: java/org/apache/commons/lang/Validate.java test/org/apache/commons/lang/ValidateTest.java
2009-12-01T12:27:41Z
2009-12-01T12:27:41Z
niallp
Author: niallp
<br>Date: Tue Dec 1 20:27:40 2009
<br>New Revision: 885913
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885913&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885913&view=rev</a><br>Log:
<br>LANG-508 Fix tests broken by r885195
<br><br>Modified:
<br> commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java
<br> commons/proper/lang/trunk/src/test/org/apache/commons/lang/ValidateTest.java
<br><br>Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java?rev=885913&r1=885912&r2=885913&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java?rev=885913&r1=885912&r2=885913&view=diff</a><br>==============================================================================
<br>--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java (original)
<br>+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java Tue Dec 1 20:27:40 2009
<br>@@ -58,7 +58,7 @@
<br> private static final String DEFAULT_NOT_EMPTY_COLLECTION_EXCEPTION_MESSAGE = "The validated collection is empty";
<br> private static final String DEFAULT_NOT_EMPTY_MAP_EXCEPTION_MESSAGE = "The validated map is empty";
<br> private static final String DEFAULT_VALID_INDEX_ARRAY_EXCEPTION_MESSAGE = "The validated array index is invalid: %d";
<br>- private static final String DEFAULT_VALID_INDEX_CHAR_SEQUENCE_EXCEPTION_MESSAGE = "The validated character sequence is invalid: %d";
<br>+ private static final String DEFAULT_VALID_INDEX_CHAR_SEQUENCE_EXCEPTION_MESSAGE = "The validated character sequence index is invalid: %d";
<br> private static final String DEFAULT_VALID_INDEX_COLLECTION_EXCEPTION_MESSAGE = "The validated collection index is invalid: %d";
<br>
<br> /**
<br><br>Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/ValidateTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/ValidateTest.java?rev=885913&r1=885912&r2=885913&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/ValidateTest.java?rev=885913&r1=885912&r2=885913&view=diff</a><br>==============================================================================
<br>--- commons/proper/lang/trunk/src/test/org/apache/commons/lang/ValidateTest.java (original)
<br>+++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/ValidateTest.java Tue Dec 1 20:27:40 2009
<br>@@ -93,7 +93,7 @@
<br> Validate.isTrue(false, "MSG", new Integer(6));
<br> fail("Expecting IllegalArgumentException");
<br> } catch (IllegalArgumentException ex) {
<br>- assertEquals("MSG6", ex.getMessage());
<br>+ assertEquals("MSG", ex.getMessage());
<br> }
<br> }
<br>
<br>@@ -104,7 +104,7 @@
<br> Validate.isTrue(false, "MSG", 7);
<br> fail("Expecting IllegalArgumentException");
<br> } catch (IllegalArgumentException ex) {
<br>- assertEquals("MSG7", ex.getMessage());
<br>+ assertEquals("MSG", ex.getMessage());
<br> }
<br> }
<br>
<br>@@ -115,7 +115,7 @@
<br> Validate.isTrue(false, "MSG", 7.4d);
<br> fail("Expecting IllegalArgumentException");
<br> } catch (IllegalArgumentException ex) {
<br>- assertEquals("MSG7.4", ex.getMessage());
<br>+ assertEquals("MSG", ex.getMessage());
<br> }
<br> }
<br>
<br>@@ -125,8 +125,8 @@
<br> Validate.notNull(new Object());
<br> try {
<br> Validate.notNull(null);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("The validated object is null", ex.getMessage());
<br> }
<br>
<br>@@ -140,8 +140,8 @@
<br> Validate.notNull(new Object(), "MSG");
<br> try {
<br> Validate.notNull(null, "MSG");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("MSG", ex.getMessage());
<br> }
<br>
<br>@@ -156,8 +156,8 @@
<br> Validate.notEmpty(new Object[] {null});
<br> try {
<br> Validate.notEmpty((Object[]) null);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("The validated array is empty", ex.getMessage());
<br> }
<br> try {
<br>@@ -177,8 +177,8 @@
<br> Validate.notEmpty(new Object[] {null}, "MSG");
<br> try {
<br> Validate.notEmpty((Object[]) null, "MSG");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("MSG", ex.getMessage());
<br> }
<br> try {
<br>@@ -199,8 +199,8 @@
<br> Collection<Integer> coll = new ArrayList<Integer>();
<br> try {
<br> Validate.notEmpty((Collection<?>) null);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("The validated collection is empty", ex.getMessage());
<br> }
<br> try {
<br>@@ -221,8 +221,8 @@
<br> Collection<Integer> coll = new ArrayList<Integer>();
<br> try {
<br> Validate.notEmpty((Collection<?>) null, "MSG");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("MSG", ex.getMessage());
<br> }
<br> try {
<br>@@ -244,8 +244,8 @@
<br> Map<String, Integer> map = new HashMap<String, Integer>();
<br> try {
<br> Validate.notEmpty((Map<?, ?>) null);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("The validated map is empty", ex.getMessage());
<br> }
<br> try {
<br>@@ -266,8 +266,8 @@
<br> Map<String, Integer> map = new HashMap<String, Integer>();
<br> try {
<br> Validate.notEmpty((Map<?, ?>) null, "MSG");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("MSG", ex.getMessage());
<br> }
<br> try {
<br>@@ -289,15 +289,15 @@
<br> Validate.notEmpty("hjl");
<br> try {
<br> Validate.notEmpty((String) null);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>- assertEquals("The validated string is empty", ex.getMessage());
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br>+ assertEquals("The validated character sequence is empty", ex.getMessage());
<br> }
<br> try {
<br> Validate.notEmpty("");
<br> fail("Expecting IllegalArgumentException");
<br> } catch (IllegalArgumentException ex) {
<br>- assertEquals("The validated string is empty", ex.getMessage());
<br>+ assertEquals("The validated character sequence is empty", ex.getMessage());
<br> }
<br>
<br> String str = "Hi";
<br>@@ -310,8 +310,8 @@
<br> Validate.notEmpty("a", "MSG");
<br> try {
<br> Validate.notEmpty((String) null, "MSG");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("MSG", ex.getMessage());
<br> }
<br> try {
<br>@@ -335,10 +335,10 @@
<br> try {
<br> //when
<br> Validate.notBlank(string);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException e) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException e) {
<br> //then
<br>- assertEquals("The validated string is blank", e.getMessage());
<br>+ assertEquals("The validated character sequence is blank", e.getMessage());
<br> }
<br> }
<br>
<br>@@ -350,8 +350,8 @@
<br> try {
<br> //when
<br> Validate.notBlank(string, "Message");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException e) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException e) {
<br> //then
<br> assertEquals("Message", e.getMessage());
<br> }
<br>@@ -368,7 +368,7 @@
<br> fail("Expecting IllegalArgumentException");
<br> } catch (IllegalArgumentException e) {
<br> //then
<br>- assertEquals("The validated string is blank", e.getMessage());
<br>+ assertEquals("The validated character sequence is blank", e.getMessage());
<br> }
<br> }
<br>
<br>@@ -383,7 +383,7 @@
<br> fail("Expecting IllegalArgumentException");
<br> } catch (IllegalArgumentException e) {
<br> //then
<br>- assertEquals("The validated string is blank", e.getMessage());
<br>+ assertEquals("The validated character sequence is blank", e.getMessage());
<br> }
<br> }
<br>
<br>@@ -398,7 +398,7 @@
<br> fail("Expecting IllegalArgumentException");
<br> } catch (IllegalArgumentException e) {
<br> //then
<br>- assertEquals("The validated string is blank", e.getMessage());
<br>+ assertEquals("The validated character sequence is blank", e.getMessage());
<br> }
<br> }
<br>
<br>@@ -533,8 +533,8 @@
<br> Validate.noNullElements(array);
<br> try {
<br> Validate.noNullElements((Object[]) null);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("The validated object is null", ex.getMessage());
<br> }
<br> array[1] = null;
<br>@@ -556,8 +556,8 @@
<br> Validate.noNullElements(array, "MSG");
<br> try {
<br> Validate.noNullElements((Object[]) null, "MSG");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("The validated object is null", ex.getMessage());
<br> }
<br> array[1] = null;
<br>@@ -582,8 +582,8 @@
<br> Validate.noNullElements(coll);
<br> try {
<br> Validate.noNullElements((Collection<?>) null);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("The validated object is null", ex.getMessage());
<br> }
<br> coll.set(1, null);
<br>@@ -607,8 +607,8 @@
<br> Validate.noNullElements(coll, "MSG");
<br> try {
<br> Validate.noNullElements((Collection<?>) null, "MSG");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting NullPointerException");
<br>+ } catch (NullPointerException ex) {
<br> assertEquals("The validated object is null", ex.getMessage());
<br> }
<br> coll.set(1, null);
<br>@@ -643,15 +643,15 @@
<br> Validate.validIndex(array, 1, "Broken: ");
<br> try {
<br> Validate.validIndex(array, -1, "Broken: ");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>- assertEquals("Broken: -1", ex.getMessage());
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br>+ assertEquals("Broken: ", ex.getMessage());
<br> }
<br> try {
<br> Validate.validIndex(array, 2, "Broken: ");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>- assertEquals("Broken: 2", ex.getMessage());
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br>+ assertEquals("Broken: ", ex.getMessage());
<br> }
<br>
<br> String[] strArray = new String[] {"Hi"};
<br>@@ -665,14 +665,14 @@
<br> Validate.validIndex(array, 1);
<br> try {
<br> Validate.validIndex(array, -1);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br> assertEquals("The validated array index is invalid: -1", ex.getMessage());
<br> }
<br> try {
<br> Validate.validIndex(array, 2);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br> assertEquals("The validated array index is invalid: 2", ex.getMessage());
<br> }
<br>
<br>@@ -691,15 +691,15 @@
<br> Validate.validIndex(coll, 1, "Broken: ");
<br> try {
<br> Validate.validIndex(coll, -1, "Broken: ");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>- assertEquals("Broken: -1", ex.getMessage());
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br>+ assertEquals("Broken: ", ex.getMessage());
<br> }
<br> try {
<br> Validate.validIndex(coll, 2, "Broken: ");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>- assertEquals("Broken: 2", ex.getMessage());
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br>+ assertEquals("Broken: ", ex.getMessage());
<br> }
<br>
<br> List<String> strColl = Arrays.asList(new String[] {"Hi"});
<br>@@ -715,14 +715,14 @@
<br> Validate.validIndex(coll, 1);
<br> try {
<br> Validate.validIndex(coll, -1);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br> assertEquals("The validated collection index is invalid: -1", ex.getMessage());
<br> }
<br> try {
<br> Validate.validIndex(coll, 2);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br> assertEquals("The validated collection index is invalid: 2", ex.getMessage());
<br> }
<br>
<br>@@ -739,15 +739,15 @@
<br> Validate.validIndex(str, 1, "Broken: ");
<br> try {
<br> Validate.validIndex(str, -1, "Broken: ");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>- assertEquals("Broken: -1", ex.getMessage());
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br>+ assertEquals("Broken: ", ex.getMessage());
<br> }
<br> try {
<br> Validate.validIndex(str, 2, "Broken: ");
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>- assertEquals("Broken: 2", ex.getMessage());
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br>+ assertEquals("Broken: ", ex.getMessage());
<br> }
<br>
<br> String input = "Hi";
<br>@@ -761,15 +761,15 @@
<br> Validate.validIndex(str, 1);
<br> try {
<br> Validate.validIndex(str, -1);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>- assertEquals("The validated string index is invalid: -1", ex.getMessage());
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br>+ assertEquals("The validated character sequence index is invalid: -1", ex.getMessage());
<br> }
<br> try {
<br> Validate.validIndex(str, 2);
<br>- fail("Expecting IllegalArgumentException");
<br>- } catch (IllegalArgumentException ex) {
<br>- assertEquals("The validated string index is invalid: 2", ex.getMessage());
<br>+ fail("Expecting IndexOutOfBoundsException");
<br>+ } catch (IndexOutOfBoundsException ex) {
<br>+ assertEquals("The validated character sequence index is invalid: 2", ex.getMessage());
<br> }
<br>
<br> String input = "Hi";
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26594170
svn commit: r885808 - /commons/proper/jexl/trunk/compat/commons-jexl-compat/
2009-12-01T07:59:05Z
2009-12-01T07:59:05Z
henrib-2
Author: henrib
<br>Date: Tue Dec 1 15:59:05 2009
<br>New Revision: 885808
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885808&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885808&view=rev</a><br>Log:
<br>Added "compat" directory that contains Jexl-1.x compatible implementations of most common classes; this is intended to facilitate trivial upgrades to 2.0 (Jelly for instance). As of now, the compatibility jar is not built automatically (need to do some research on how to do this correctly).
<br>As a result, the deprecated classes ({Script,Expression}Factory) have been moved to this package.
<br><br>Modified:
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/ (props changed)
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/
<br>------------------------------------------------------------------------------
<br>--- svn:ignore (added)
<br>+++ svn:ignore Tue Dec 1 15:59:05 2009
<br>@@ -0,0 +1 @@
<br>+target
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26591180
svn commit: r885755 - /commons/proper/jexl/trunk/compat/commons-jexl-compat/target/
2009-12-01T04:48:14Z
2009-12-01T04:48:14Z
henrib-2
Author: henrib
<br>Date: Tue Dec 1 12:48:13 2009
<br>New Revision: 885755
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885755&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885755&view=rev</a><br>Log: (empty)
<br><br>Removed:
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/
<br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26591167
svn commit: r885754 - in /commons/proper/jexl/trunk: compat/ compat/commons-jexl-compat/ compat/commons-jexl-compat/src/ compat/commons-jexl-compat/src/main/ compat/commons-jexl-compat/src/main/java/ compat/commons-jexl-compat/src/main/java/org/ compat...
2009-12-01T04:47:02Z
2009-12-01T04:47:02Z
henrib-2
Author: henrib
<br>Date: Tue Dec 1 12:47:00 2009
<br>New Revision: 885754
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885754&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885754&view=rev</a><br>Log:
<br>Added compat directory that contains Jexl-1.x compatible implementations of most common classes; this is intended to facilitate trivial upgrades to 2.0 (Jelly for instance). As of now, the compatibility jar is not built automatically (need to do some research on how to do this correctly).
<br>As a result, the deprecated classes ({Script,Expression}Factory) have been moved to this package.
<br><br>Added:
<br> commons/proper/jexl/trunk/compat/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/pom.xml (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlContext.java (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlHelper.java (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Script.java (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/HashMapContext.java (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/package.html (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/package.html (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/resources/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/org/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/org/apache/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/org/apache/commons/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/org/apache/commons/jexl/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/Expression.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/ExpressionFactory.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlContext.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlHelper.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$1.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$ContextAdapter.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$EngineHolder.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$JexlOneEngine.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$JexlOneExpression.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$JexlOneInterpreter.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/Script.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/ScriptFactory.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/context/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/context/HashMapContext.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/commons-jexl-compat-2.0-SNAPSHOT.jar (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/maven-archiver/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/maven-archiver/pom.properties (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/osgi/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/osgi/MANIFEST.MF (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/TEST-org.apache.commons.jexl.ScriptTest.xml (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/org.apache.commons.jexl.ScriptTest.txt (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/jexl/
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/jexl/ScriptTest$Tester.class (with props)
<br> commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/jexl/ScriptTest.class (with props)
<br>Removed:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionFactory.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ScriptFactory.java
<br>Modified:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/pom.xml?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/pom.xml?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/pom.xml (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/pom.xml Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,86 @@
<br>+
<br>+<project xmlns="<a href="http://maven.apache.org/POM/4.0.0" target="_top" rel="nofollow">http://maven.apache.org/POM/4.0.0</a>" xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>+ xsi:schemaLocation="<a href="http://maven.apache.org/POM/4.0.0" target="_top" rel="nofollow">http://maven.apache.org/POM/4.0.0</a> <a href="http://maven.apache.org/maven-v4_0_0.xsd" target="_top" rel="nofollow">http://maven.apache.org/maven-v4_0_0.xsd</a>">
<br>+ <parent>
<br>+ <groupId>org.apache.commons</groupId>
<br>+ <artifactId>commons-parent</artifactId>
<br>+ <version>12</version>
<br>+ </parent>
<br>+ <modelVersion>4.0.0</modelVersion>
<br>+ <groupId>org.apache.commons</groupId>
<br>+ <artifactId>commons-jexl-compat</artifactId>
<br>+ <name>Commons JEXL (1.x compatibility)</name>
<br>+ <version>2.0-SNAPSHOT</version>
<br>+ <inceptionYear>2003</inceptionYear>
<br>+ <description>Jexl is an implementation of the JSTL Expression Language with extensions.</description>
<br>+ <url><a href="http://commons.apache.org/jexl/" target="_top" rel="nofollow">http://commons.apache.org/jexl/</a></url>
<br>+
<br>+ <issueManagement>
<br>+ <system>jira</system>
<br>+ <url><a href="http://issues.apache.org/jira/browse/JEXL" target="_top" rel="nofollow">http://issues.apache.org/jira/browse/JEXL</a></url>
<br>+ </issueManagement>
<br>+
<br>+ <scm>
<br>+ <connection>scm:svn:<a href="http://svn.apache.org/repos/asf/commons/proper/jexl/trunk" target="_top" rel="nofollow">http://svn.apache.org/repos/asf/commons/proper/jexl/trunk</a></connection>
<br>+ <developerConnection>scm:svn:<a href="https://svn.apache.org/repos/asf/commons/proper/jexl/trunk" target="_top" rel="nofollow">https://svn.apache.org/repos/asf/commons/proper/jexl/trunk</a></developerConnection>
<br>+ <url><a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk</a></url>
<br>+ </scm>
<br>+
<br>+
<br>+ <build>
<br>+ <plugins>
<br>+ <plugin>
<br>+ <groupId>org.apache.maven.plugins</groupId>
<br>+ <artifactId>maven-surefire-plugin</artifactId>
<br>+ <configuration>
<br>+ <includes>
<br>+ <include>**/*Test.java</include>
<br>+ </includes>
<br>+ </configuration>
<br>+ </plugin>
<br>+ <plugin>
<br>+ <groupId>org.apache.maven.plugins</groupId>
<br>+ <artifactId>maven-compiler-plugin</artifactId>
<br>+ <configuration>
<br>+ <source>1.5</source>
<br>+ <target>1.5</target>
<br>+ </configuration>
<br>+ </plugin>
<br>+ </plugins>
<br>+ </build>
<br>+
<br>+ <dependencies>
<br>+ <dependency>
<br>+ <groupId>junit</groupId>
<br>+ <artifactId>junit</artifactId>
<br>+ <version>3.8.1</version>
<br>+ <scope>test</scope>
<br>+ </dependency>
<br>+ <dependency>
<br>+ <groupId>commons-logging</groupId>
<br>+ <artifactId>commons-logging</artifactId>
<br>+ <version>1.1.1</version>
<br>+ </dependency>
<br>+ <dependency>
<br>+ <groupId>org.apache.commons</groupId>
<br>+ <artifactId>commons-jexl</artifactId>
<br>+ <version>2.0-SNAPSHOT</version>
<br>+ </dependency>
<br>+ </dependencies>
<br>+
<br>+ <properties>
<br>+ <maven.compile.source>1.5</maven.compile.source>
<br>+ <maven.compile.target>1.5</maven.compile.target>
<br>+ <commons.componentid>jexl-compat</commons.componentid>
<br>+ <commons.release.version>2.0</commons.release.version>
<br>+ <!-- The RC version used in the staging repository URL. -->
<br>+ <commons.rc.version>RC3</commons.rc.version>
<br>+ <commons.binary.suffix />
<br>+ <commons.jira.id>JEXL</commons.jira.id>
<br>+ <commons.jira.pid>12310479</commons.jira.pid>
<br>+ <!-- Temp fix until parent POM is updated -->
<br>+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<br>+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<br>+ </properties>
<br>+</project>
<br>+
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/pom.xml
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,35 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+
<br>+package org.apache.commons.jexl;
<br>+
<br>+/**
<br>+ * Jexl-1.x compatible expression.
<br>+ * @since 2.0
<br>+ * @version $Id$
<br>+ */
<br>+public interface Expression extends org.apache.commons.jexl2.Expression {
<br>+ /**
<br>+ * Evaluates the expression with the variables contained in the
<br>+ * supplied {@link JexlContext}.
<br>+ *
<br>+ * @param context A JexlContext containing variables.
<br>+ * @return The result of this evaluation
<br>+ * @throws Exception on any error
<br>+ */
<br>+ Object evaluate(JexlContext context) throws Exception;
<br>+}
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Expression.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,49 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.commons.jexl;
<br>+
<br>+import org.apache.commons.jexl2.JexlEngine;
<br>+
<br>+/**
<br>+ * Creates Expression objects.
<br>+ * <p>
<br>+ * To create a JEXL Expression object, pass
<br>+ * valid JEXL syntax to the static createExpression() method:
<br>+ * </p>
<br>+ *
<br>+ * <pre>
<br>+ * String jexl = "array[1]";
<br>+ * Expression expression = ExpressionFactory.createExpression( jexl );
<br>+ * </pre>
<br>+ *
<br>+ * <p>
<br>+ * When an {@link Expression} object is created, the JEXL syntax is
<br>+ * parsed and verified. If the supplied expression is neither an
<br>+ * expression nor a reference, an exception is thrown from createException().
<br>+ * </p>
<br>+ *
<br>+ * <p>
<br>+ * This is a convenience class; using an instance of a {@link JexlEngine}
<br>+ * that serves the same purpose with more control is recommended.
<br>+ * </p>
<br>+ * @since 1.0
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26591167&i=0" target="_top" rel="nofollow">geirm@...</a>">Geir Magnusson Jr.</a>
<br>+ * @version $Id: ExpressionFactory.java 884175 2009-11-25 16:23:41Z henrib $
<br>+ * @deprecated Create a JexlEngine and use the createScript method on that instead.
<br>+ */
<br>+@Deprecated
<br>+public final class ExpressionFactory extends JexlOne {}
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ExpressionFactory.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlContext.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlContext.java?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlContext.java?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlContext.java (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlContext.java Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,48 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.commons.jexl;
<br>+
<br>+import java.util.Map;
<br>+
<br>+/**
<br>+ * Holds a Map of variables which are referenced in a JEXL expression.
<br>+ *
<br>+ * @since 1.0
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26591167&i=1" target="_top" rel="nofollow">geirm@...</a>">Geir Magnusson Jr.</a>
<br>+ * @version $Id: JexlContext.java 480412 2006-11-29 05:11:23Z bayard $
<br>+ */
<br>+public interface JexlContext {
<br>+ /**
<br>+ * Replaces variables in a JexlContext with the variables contained
<br>+ * in the supplied Map. When setVars() is called on a JexlContext,
<br>+ * it clears the current Map and puts each entry of the
<br>+ * supplied Map into the current variable Map.
<br>+ *
<br>+ * @param vars Contents of vars will be replaced with the content
<br>+ * of this Map
<br>+ */
<br>+ void setVars(Map<String,Object> vars);
<br>+
<br>+ /**
<br>+ * Retrives the Map of variables associated with this JexlContext. The
<br>+ * keys of this map correspond to variable names referenced in a
<br>+ * JEXL expression.
<br>+ *
<br>+ * @return A reference to the variable Map associated with this JexlContext.
<br>+ */
<br>+ Map<String,Object> getVars();
<br>+}
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlContext.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlHelper.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlHelper.java?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlHelper.java?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlHelper.java (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlHelper.java Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,58 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+
<br>+package org.apache.commons.jexl;
<br>+
<br>+import org.apache.commons.jexl.context.HashMapContext;
<br>+
<br>+/**
<br>+ * Helper to create a context. In the current implementation of JEXL, there
<br>+ * is one implementation of JexlContext - {@link HashMapContext}, and there
<br>+ * is no reason not to directly instantiate {@link HashMapContext} in your
<br>+ * own application.
<br>+ *
<br>+ * @since 1.0
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26591167&i=2" target="_top" rel="nofollow">geirm@...</a>">Geir Magnusson Jr.</a>
<br>+ * @version $Id: JexlHelper.java 480412 2006-11-29 05:11:23Z bayard $
<br>+ */
<br>+public class JexlHelper {
<br>+ /** singleton instance. */
<br>+ protected static JexlHelper helper = new JexlHelper();
<br>+
<br>+ /** @return the single instance. */
<br>+ protected static JexlHelper getInstance() {
<br>+ return helper;
<br>+ }
<br>+
<br>+ /**
<br>+ * Returns a new {@link JexlContext}.
<br>+ * @return a new JexlContext
<br>+ */
<br>+ public static JexlContext createContext() {
<br>+ return getInstance().newContext();
<br>+ }
<br>+
<br>+ /**
<br>+ * Creates and returns a new {@link JexlContext}.
<br>+ * The current implementation creates a new instance of
<br>+ * {@link HashMapContext}.
<br>+ * @return a new JexlContext
<br>+ */
<br>+ protected JexlContext newContext() {
<br>+ return new HashMapContext();
<br>+ }
<br>+}
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlHelper.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,277 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.commons.jexl;
<br>+
<br>+import java.io.File;
<br>+import java.net.URL;
<br>+import org.apache.commons.jexl2.JexlEngine;
<br>+import org.apache.commons.jexl2.Interpreter;
<br>+import org.apache.commons.jexl2.JexlException;
<br>+import org.apache.commons.jexl2.parser.JexlNode;
<br>+import org.apache.commons.jexl2.parser.ASTJexlScript;
<br>+
<br>+/**
<br>+ * This implements Jexl-1.x (Jelly) compatible behaviors on top of Jexl-2.0.
<br>+ * @since 2.0
<br>+ * @version $Id$
<br>+ */
<br>+public class JexlOne {
<br>+ /**
<br>+ * Default cache size.
<br>+ */
<br>+ private static final int CACHE_SIZE = 256;
<br>+
<br>+ /**
<br>+ * Private constructor, ensure no instance.
<br>+ */
<br>+ protected JexlOne() {}
<br>+
<br>+
<br>+ /**
<br>+ * Lazy JexlEngine singleton through on demand holder idiom.
<br>+ */
<br>+ private static final class EngineHolder {
<br>+ /** The shared instance. */
<br>+ static final JexlOneEngine JEXL10 = new JexlOneEngine();
<br>+ /**
<br>+ * Non-instantiable.
<br>+ */
<br>+ private EngineHolder() {}
<br>+ }
<br>+
<br>+
<br>+ /**
<br>+ * A Jexl1.x context wrapped into a Jexl2 context.
<br>+ */
<br>+ private static final class ContextAdapter implements org.apache.commons.jexl2.JexlContext {
<br>+ /** The Jexl1.x context. */
<br>+ private final JexlContext legacy;
<br>+
<br>+ /**
<br>+ * Creates a jexl2.JexlContext from a jexl.JexlContext.
<br>+ * @param ctxt10
<br>+ */
<br>+ ContextAdapter(JexlContext ctxt10) {
<br>+ legacy = ctxt10;
<br>+ }
<br>+
<br>+ /**
<br>+ * {@inheritDoc}
<br>+ */
<br>+ public Object get(String name) {
<br>+ return legacy.getVars().get(name);
<br>+ }
<br>+
<br>+ /**
<br>+ * {@inheritDoc}
<br>+ */
<br>+ public void set(String name, Object value) {
<br>+ legacy.getVars().put(name, value);
<br>+ }
<br>+
<br>+ /**
<br>+ * {@inheritDoc}
<br>+ */
<br>+ public boolean has(String name) {
<br>+ return legacy.getVars().containsKey(name);
<br>+ }
<br>+
<br>+ /**
<br>+ * Adapts a Jexl-1.x context to a Jexl-2.0 context.
<br>+ * @param aContext a oac.jexl context
<br>+ * @return an oac.jexl2 context
<br>+ */
<br>+ static final org.apache.commons.jexl2.JexlContext adapt(JexlContext aContext) {
<br>+ return aContext == null ? JexlOneEngine.EMPTY_CONTEXT : new ContextAdapter(aContext);
<br>+ }
<br>+ }
<br>+
<br>+
<br>+ /**
<br>+ * An interpreter made compatible with v1.1 behavior (at least Jelly's expectations).
<br>+ */
<br>+ private static final class JexlOneInterpreter extends Interpreter {
<br>+ /**
<br>+ * Creates an instance.
<br>+ * @param jexl the jexl engine
<br>+ * @param aContext the jexl context
<br>+ */
<br>+ public JexlOneInterpreter(JexlEngine jexl, JexlContext aContext) {
<br>+ super(jexl, ContextAdapter.adapt(aContext));
<br>+ }
<br>+
<br>+ /**{@inheritDoc}*/
<br>+ @Override
<br>+ public Object interpret(JexlNode node) {
<br>+ try {
<br>+ return node.jjtAccept(this, null);
<br>+ } catch (JexlException xjexl) {
<br>+ Throwable e = xjexl.getCause();
<br>+ if (e instanceof RuntimeException) {
<br>+ throw (RuntimeException) e;
<br>+ }
<br>+ if (e instanceof IllegalStateException) {
<br>+ throw (IllegalStateException) e;
<br>+ }
<br>+ throw new IllegalStateException(e.getMessage(), e);
<br>+ }
<br>+ }
<br>+
<br>+ /**{@inheritDoc}*/
<br>+ @Override
<br>+ protected Object invocationFailed(JexlException xjexl) {
<br>+ throw xjexl;
<br>+ }
<br>+
<br>+ /**{@inheritDoc}*/
<br>+ @Override
<br>+ protected Object unknownVariable(JexlException xjexl) {
<br>+ return null;
<br>+ }
<br>+ }
<br>+
<br>+
<br>+ /**
<br>+ * An engine that uses a JexlOneInterpreter.
<br>+ */
<br>+ private static final class JexlOneEngine extends JexlEngine {
<br>+ /**
<br>+ * Default ctor, creates a cache and sets instance to verbose (ie non-silent).
<br>+ */
<br>+ private JexlOneEngine() {
<br>+ super();
<br>+ setCache(CACHE_SIZE);
<br>+ setSilent(false);
<br>+ }
<br>+
<br>+ /**{@inheritDoc}*/
<br>+ protected Interpreter createInterpreter(JexlContext context) {
<br>+ return new JexlOne.JexlOneInterpreter(this, context);
<br>+ }
<br>+
<br>+ /** {@inheritDoc} */
<br>+ @Override
<br>+ protected Script createScript(ASTJexlScript tree, String text) {
<br>+ return new JexlOneExpression(this, text, tree);
<br>+ }
<br>+
<br>+ /** {@inheritDoc} */
<br>+ @Override
<br>+ protected Expression createExpression(ASTJexlScript tree, String text) {
<br>+ return new JexlOneExpression(this, text, tree);
<br>+ }
<br>+ }
<br>+
<br>+ /**
<br>+ * The specific Jexl-1.x expressions implementation.
<br>+ */
<br>+ private static final class JexlOneExpression
<br>+ extends org.apache.commons.jexl2.ExpressionImpl
<br>+ implements Expression, Script {
<br>+ /**
<br>+ * Default local ctor.
<br>+ *
<br>+ * @param engine the interpreter to evaluate the expression
<br>+ * @param expr the expression.
<br>+ * @param ref the parsed expression.
<br>+ */
<br>+ private JexlOneExpression(JexlOne.JexlOneEngine engine, String expr, ASTJexlScript ref) {
<br>+ super(engine, expr, ref);
<br>+ }
<br>+
<br>+ /**
<br>+ * {@inheritDoc}
<br>+ */
<br>+ public Object evaluate(JexlContext context) {
<br>+ return super.evaluate(ContextAdapter.adapt(context));
<br>+ }
<br>+
<br>+ /**
<br>+ * {@inheritDoc}
<br>+ */
<br>+ public Object execute(JexlContext context) {
<br>+ return super.execute(ContextAdapter.adapt(context));
<br>+ }
<br>+ }
<br>+
<br>+
<br>+ /**
<br>+ * Creates a Script from a String containing valid JEXL syntax.
<br>+ * This method parses the script which validates the syntax.
<br>+ *
<br>+ * @param scriptText A String containing valid JEXL syntax
<br>+ * @return A {@link Script} which can be executed with a
<br>+ * {@link JexlContext}.
<br>+ * @throws Exception An exception can be thrown if there is a
<br>+ * problem parsing the script.
<br>+ * @deprecated Create a JexlEngine and use the createScript method on that instead.
<br>+ */
<br>+ @Deprecated
<br>+ public static Script createScript(String scriptText) throws Exception {
<br>+ return (Script) EngineHolder.JEXL10.createScript(scriptText);
<br>+ }
<br>+
<br>+ /**
<br>+ * Creates a Script from a {@link File} containing valid JEXL syntax.
<br>+ * This method parses the script and validates the syntax.
<br>+ *
<br>+ * @param scriptFile A {@link File} containing valid JEXL syntax.
<br>+ * Must not be null. Must be a readable file.
<br>+ * @return A {@link Script} which can be executed with a
<br>+ * {@link JexlContext}.
<br>+ * @throws Exception An exception can be thrown if there is a problem
<br>+ * parsing the script.
<br>+ * @deprecated Create a JexlEngine and use the createScript method on that instead.
<br>+ */
<br>+ @Deprecated
<br>+ public static Script createScript(File scriptFile) throws Exception {
<br>+ return (Script) EngineHolder.JEXL10.createScript(scriptFile);
<br>+ }
<br>+
<br>+ /**
<br>+ * Creates a Script from a {@link URL} containing valid JEXL syntax.
<br>+ * This method parses the script and validates the syntax.
<br>+ *
<br>+ * @param scriptUrl A {@link URL} containing valid JEXL syntax.
<br>+ * Must not be null. Must be a readable file.
<br>+ * @return A {@link Script} which can be executed with a
<br>+ * {@link JexlContext}.
<br>+ * @throws Exception An exception can be thrown if there is a problem
<br>+ * parsing the script.
<br>+ * @deprecated Create a JexlEngine and use the createScript method on that instead.
<br>+ */
<br>+ @Deprecated
<br>+ public static Script createScript(URL scriptUrl) throws Exception {
<br>+ return (Script) EngineHolder.JEXL10.createScript(scriptUrl);
<br>+ }
<br>+
<br>+ /**
<br>+ * Creates an Expression from a String containing valid
<br>+ * JEXL syntax. This method parses the expression which
<br>+ * must contain either a reference or an expression.
<br>+ * @param expression A String containing valid JEXL syntax
<br>+ * @return An Expression object which can be evaluated with a JexlContext
<br>+ * @throws JexlException An exception can be thrown if there is a problem
<br>+ * parsing this expression, or if the expression is neither an
<br>+ * expression or a reference.
<br>+ * @deprecated Create a JexlEngine and use createExpression() on that
<br>+ */
<br>+ @Deprecated
<br>+ public static Expression createExpression(String expression) {
<br>+ return (Expression) EngineHolder.JEXL10.createExpression(expression);
<br>+ }
<br>+}
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/JexlOne.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Script.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Script.java?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Script.java?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Script.java (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Script.java Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,35 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.commons.jexl;
<br>+
<br>+/**
<br>+ * Jexl-1.x compatible script.
<br>+ * @since 2.0
<br>+ * @version $Id$
<br>+ */
<br>+public interface Script extends org.apache.commons.jexl2.Script {
<br>+ /**
<br>+ * Executes the script with the variables contained in the
<br>+ * supplied {@link JexlContext}.
<br>+ *
<br>+ * @param context A JexlContext containing variables.
<br>+ * @return The result of this script, usually the result of
<br>+ * the last statement.
<br>+ * @throws Exception on any script parse or execution error.
<br>+ */
<br>+ Object execute(JexlContext context) throws Exception;
<br>+}
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/Script.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,47 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.commons.jexl;
<br>+
<br>+import org.apache.commons.jexl2.JexlEngine;
<br>+
<br>+/**
<br>+ * <p>
<br>+ * Creates {@link Script}s. To create a JEXL Script, pass
<br>+ * valid JEXL syntax to the static createScript() method:
<br>+ * </p>
<br>+ *
<br>+ * <pre>
<br>+ * String jexl = "y = x * 12 + 44; y = y * 4;";
<br>+ * Script script = ScriptFactory.createScript( jexl );
<br>+ * </pre>
<br>+ *
<br>+ * <p>
<br>+ * When an {@link Script} is created, the JEXL syntax is
<br>+ * parsed and verified.
<br>+ * </p>
<br>+ *
<br>+ * <p>
<br>+ * This is a convenience class; using an instance of a {@link JexlEngine}
<br>+ * that serves the same purpose with more control is recommended.
<br>+ * </p>
<br>+ * @since 1.1
<br>+ * @version $Id: ScriptFactory.java 884175 2009-11-25 16:23:41Z henrib $
<br>+ * @deprecated Create a JexlEngine and use the createScript method on that instead.
<br>+ */
<br>+@Deprecated
<br>+public final class ScriptFactory extends JexlOne {}
<br>+
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/ScriptFactory.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/HashMapContext.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/HashMapContext.java?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/HashMapContext.java?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/HashMapContext.java (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/HashMapContext.java Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,49 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+
<br>+package org.apache.commons.jexl.context;
<br>+
<br>+import org.apache.commons.jexl.JexlContext;
<br>+
<br>+import java.util.HashMap;
<br>+import java.util.Map;
<br>+
<br>+/**
<br>+ * Implementation of JexlContext based on a HashMap.
<br>+ *
<br>+ * @since 1.0
<br>+ * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26591167&i=3" target="_top" rel="nofollow">geirm@...</a>">Geir Magnusson Jr.</a>
<br>+ * @version $Id: HashMapContext.java 706202 2008-10-20 10:28:25Z sebb $
<br>+ */
<br>+public class HashMapContext extends HashMap<String,Object> implements JexlContext {
<br>+ /** serialization version id jdk13 generated. */
<br>+ private static final long serialVersionUID = 5715964743204418854L;
<br>+ /**
<br>+ * {@inheritDoc}
<br>+ */
<br>+ public void setVars(Map<String,Object> vars) {
<br>+ clear();
<br>+ putAll(vars);
<br>+ }
<br>+
<br>+ /**
<br>+ * {@inheritDoc}
<br>+ */
<br>+ public Map<String,Object> getVars() {
<br>+ return this;
<br>+ }
<br>+}
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/HashMapContext.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/package.html
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/package.html?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/package.html?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/package.html (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/package.html Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,20 @@
<br>+<html>
<br>+ <head>
<br>+ <title>Package Documentation for org.apache.commons.jexl.context Package</title>
<br>+ </head>
<br>+ <body bgcolor="white">
<br>+ Simple JexlContext implementations.
<br>+ <br><br>
<br>+ <p>
<br>+ <ul>
<br>+ <li><a href="#intro">Introduction</a></li>
<br>+ </ul>
<br>+ </p>
<br>+ <h2><a name="intro">Introduction</a></h2>
<br>+ <p>
<br>+ This package only contains one JexlContext implementation, the
<br>+ HashMapContext. A HashMapContext is simply an extension of
<br>+ HashMap which implements the JexlContext interface.
<br>+ </p>
<br>+</body>
<br>+</html>
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/context/package.html
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/package.html
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/package.html?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/package.html?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/package.html (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/package.html Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,23 @@
<br>+<html>
<br>+ <head>
<br>+ <title>Package Documentation for org.apache.commons.jexl Package</title>
<br>+ </head>
<br>+ <body bgcolor="white">
<br>+ Jexl-1.x compatible implementations.
<br>+ <br>
<br>+ <p>
<br>+ This package only contains classes that re-implement Jexl-1.x interfaces
<br>+ and behaviors. This is intended to allow easier conversion to Jexl-2.0.
<br>+ </p>
<br>+ <p>
<br>+ Jexl-2.0 changed a lot of APIs and behaviors, enough to warrant for putting it
<br>+ in its own org.apache.commons.jexl2 package and avoid possible "jar-hell" cases.
<br>+ Those could have occured if someone was trying to use both Jexl-2.0 and Jexl-1.x.
<br>+ </p>
<br>+ <p>
<br>+ This package contains the original Jexl-1.x main API namely ScriptFactory, ExpressionFactory,
<br>+ Script, Expression, JexlContext and JexlHelper. It is not 100% compatible with
<br>+ the original Jexl-1.x codeline but should be close enough for "casual" usage.
<br>+ </p>
<br>+ </body>
<br>+</html>
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/main/java/org/apache/commons/jexl/package.html
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,102 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.commons.jexl;
<br>+import junit.framework.TestCase;
<br>+import java.io.File;
<br>+import java.net.URL;
<br>+
<br>+/**
<br>+ * Tests for Script
<br>+ * @since 1.1
<br>+ */
<br>+public class ScriptTest extends TestCase {
<br>+ static final String TEST1 = "../../src/test/scripts/test1.jexl";
<br>+
<br>+ // test class for testScriptUpdatesContext
<br>+ // making this class private static will cause the test to fail.
<br>+ // this is due to unusual code in ClassMap.getAccessibleMethods(Class)
<br>+ // that treats non-public classes in a specific way. Why getAccessibleMethods
<br>+ // does this is not known yet.
<br>+ public static class Tester {
<br>+ private String code;
<br>+ public String getCode () {
<br>+ return code;
<br>+ }
<br>+ public void setCode(String c) {
<br>+ code = c;
<br>+ }
<br>+ }
<br>+ /**
<br>+ * Create a new test case.
<br>+ * @param name case name
<br>+ */
<br>+ public ScriptTest(String name) {
<br>+ super(name);
<br>+ }
<br>+
<br>+ /**
<br>+ * Test creating a script from a string.
<br>+ */
<br>+ public void testSimpleScript() throws Exception {
<br>+ String code = "while (x < 10) x = x + 1;";
<br>+ Script s = ScriptFactory.createScript(code);
<br>+ JexlContext jc = JexlHelper.createContext();
<br>+ jc.getVars().put("x", new Integer(1));
<br>+
<br>+ Object o = s.execute(jc);
<br>+ assertEquals("Result is wrong", new Integer(10), o);
<br>+ assertEquals("getText is wrong", code, s.getText());
<br>+ }
<br>+
<br>+ public void testScriptFromFile() throws Exception {
<br>+ File testScript = new File(TEST1);
<br>+ Script s = ScriptFactory.createScript(testScript);
<br>+ JexlContext jc = JexlHelper.createContext();
<br>+ jc.getVars().put("out", System.out);
<br>+ Object result = s.execute(jc);
<br>+ assertNotNull("No result", result);
<br>+ assertEquals("Wrong result", new Integer(7), result);
<br>+ }
<br>+
<br>+ public void testScriptFromURL() throws Exception {
<br>+ URL testUrl = new File(TEST1).toURI().toURL();
<br>+ Script s = ScriptFactory.createScript(testUrl);
<br>+ JexlContext jc = JexlHelper.createContext();
<br>+ jc.getVars().put("out", System.out);
<br>+ Object result = s.execute(jc);
<br>+ assertNotNull("No result", result);
<br>+ assertEquals("Wrong result", new Integer(7), result);
<br>+ }
<br>+
<br>+ public void testScriptUpdatesContext() throws Exception {
<br>+ String jexlCode = "resultat.setCode('OK')";
<br>+ Expression e = ExpressionFactory.createExpression(jexlCode);
<br>+ Script s = ScriptFactory.createScript(jexlCode);
<br>+
<br>+ Tester resultatJexl = new Tester();
<br>+ JexlContext jc = JexlHelper.createContext();
<br>+ jc.getVars().put("resultat", resultatJexl);
<br>+
<br>+ resultatJexl.setCode("");
<br>+ e.evaluate(jc);
<br>+ assertEquals("OK", resultatJexl.getCode());
<br>+ resultatJexl.setCode("");
<br>+ s.execute(jc);
<br>+ assertEquals("OK", resultatJexl.getCode());
<br>+ }
<br>+
<br>+}
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/src/test/java/org/apache/commons/jexl/ScriptTest.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/Expression.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/Expression.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/Expression.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/Expression.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/ExpressionFactory.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/ExpressionFactory.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/ExpressionFactory.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/ExpressionFactory.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlContext.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlContext.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlContext.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlContext.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlHelper.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlHelper.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlHelper.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlHelper.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$1.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%241.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%241.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$1.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$ContextAdapter.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%24ContextAdapter.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%24ContextAdapter.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$ContextAdapter.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$EngineHolder.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%24EngineHolder.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%24EngineHolder.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$EngineHolder.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$JexlOneEngine.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%24JexlOneEngine.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%24JexlOneEngine.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$JexlOneEngine.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$JexlOneExpression.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%24JexlOneExpression.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%24JexlOneExpression.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$JexlOneExpression.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$JexlOneInterpreter.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%24JexlOneInterpreter.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne%24JexlOneInterpreter.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne$JexlOneInterpreter.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/JexlOne.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/Script.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/Script.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/Script.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/Script.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/ScriptFactory.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/ScriptFactory.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/ScriptFactory.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/ScriptFactory.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/context/HashMapContext.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/context/HashMapContext.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/context/HashMapContext.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/classes/org/apache/commons/jexl/context/HashMapContext.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/commons-jexl-compat-2.0-SNAPSHOT.jar
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/commons-jexl-compat-2.0-SNAPSHOT.jar?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/commons-jexl-compat-2.0-SNAPSHOT.jar?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/commons-jexl-compat-2.0-SNAPSHOT.jar
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/maven-archiver/pom.properties
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/maven-archiver/pom.properties?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/maven-archiver/pom.properties?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/target/maven-archiver/pom.properties (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/target/maven-archiver/pom.properties Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,5 @@
<br>+#Generated by Maven
<br>+#Tue Dec 01 13:33:27 CET 2009
<br>+version=2.0-SNAPSHOT
<br>+groupId=org.apache.commons
<br>+artifactId=commons-jexl-compat
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/maven-archiver/pom.properties
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/osgi/MANIFEST.MF
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/osgi/MANIFEST.MF?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/osgi/MANIFEST.MF?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/target/osgi/MANIFEST.MF (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/target/osgi/MANIFEST.MF Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,19 @@
<br>+Manifest-Version: 1.0
<br>+Export-Package: org.apache.commons.jexl;version="2.0.0.SNAPSHOT",org.a
<br>+ pache.commons.jexl.context;version="2.0.0.SNAPSHOT"
<br>+Tool: Bnd-0.0.238
<br>+Bundle-Name: Commons JEXL (1.x compatibility)
<br>+Created-By: 1.6.0_15 (Apple Inc.)
<br>+Bundle-Vendor: The Apache Software Foundation
<br>+Bundle-Version: 2.0.0.SNAPSHOT
<br>+Bnd-LastModified: 1259670805939
<br>+Bundle-ManifestVersion: 2
<br>+Bundle-License: <a href="http://www.apache.org/licenses/LICENSE-2.0.txt" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0.txt</a><br>+Bundle-Description: Jexl is an implementation of the JSTL Expression L
<br>+ anguage with extensions.
<br>+Import-Package: org.apache.commons.jexl;version="2.0.0.SNAPSHOT",org.a
<br>+ pache.commons.jexl.context;version="2.0.0.SNAPSHOT",org.apache.common
<br>+ s.jexl2,org.apache.commons.jexl2.parser
<br>+Bundle-SymbolicName: org.apache.commons.jexl-compat
<br>+Bundle-DocURL: <a href="http://commons.apache.org/jexl/" target="_top" rel="nofollow">http://commons.apache.org/jexl/</a><br>+
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/osgi/MANIFEST.MF
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/TEST-org.apache.commons.jexl.ScriptTest.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/TEST-org.apache.commons.jexl.ScriptTest.xml?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/TEST-org.apache.commons.jexl.ScriptTest.xml?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/TEST-org.apache.commons.jexl.ScriptTest.xml (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/TEST-org.apache.commons.jexl.ScriptTest.xml Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,70 @@
<br>+<?xml version="1.0" encoding="UTF-8" ?>
<br>+<testsuite failures="0" time="0.134" errors="0" skipped="0" tests="4" name="org.apache.commons.jexl.ScriptTest">
<br>+ <properties>
<br>+ <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
<br>+ <property name="sun.boot.library.path" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Libraries"/>
<br>+ <property name="java.vm.version" value="14.1-b02-90"/>
<br>+ <property name="awt.nativeDoubleBuffering" value="true"/>
<br>+ <property name="gopherProxySet" value="false"/>
<br>+ <property name="java.vm.vendor" value="Apple Inc."/>
<br>+ <property name="java.vendor.url" value="<a href="http://www.apple.com/" target="_top" rel="nofollow">http://www.apple.com/</a>"/>
<br>+ <property name="path.separator" value=":"/>
<br>+ <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
<br>+ <property name="file.encoding.pkg" value="sun.io"/>
<br>+ <property name="user.country" value="US"/>
<br>+ <property name="sun.java.launcher" value="SUN_STANDARD"/>
<br>+ <property name="sun.os.patch.level" value="unknown"/>
<br>+ <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<br>+ <property name="user.dir" value="/Users/henri/Java/apache-commons/commons-parent-12/jexl-2.0/compat/commons-jexl-compat"/>
<br>+ <property name="java.runtime.version" value="1.6.0_15-b03-219"/>
<br>+ <property name="java.awt.graphicsenv" value="apple.awt.CGraphicsEnvironment"/>
<br>+ <property name="basedir" value="/Users/henri/Java/apache-commons/commons-parent-12/jexl-2.0/compat/commons-jexl-compat"/>
<br>+ <property name="java.endorsed.dirs" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/lib/endorsed"/>
<br>+ <property name="os.arch" value="x86_64"/>
<br>+ <property name="surefire.real.class.path" value="/var/folders/Ya/YaSJZzgsHu4O4NXovx-nNE+++TI/-Tmp-/surefirebooter3767222523623553200.jar"/>
<br>+ <property name="java.io.tmpdir" value="/var/folders/Ya/YaSJZzgsHu4O4NXovx-nNE+++TI/-Tmp-/"/>
<br>+ <property name="line.separator" value="
<br>+"/>
<br>+ <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
<br>+ <property name="os.name" value="Mac OS X"/>
<br>+ <property name="sun.jnu.encoding" value="MacRoman"/>
<br>+ <property name="java.library.path" value=".:/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java"/>
<br>+ <property name="surefire.test.class.path" value="/Users/henri/Java/apache-commons/commons-parent-12/jexl-2.0/compat/commons-jexl-compat/target/test-classes:/Users/henri/Java/apache-commons/commons-parent-12/jexl-2.0/compat/commons-jexl-compat/target/classes:/Users/henri/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar:/Users/henri/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar:/Users/henri/.m2/repository/org/apache/commons/commons-jexl/2.0-SNAPSHOT/commons-jexl-2.0-SNAPSHOT.jar:/Users/henri/.m2/repository/org/apache/bsf/bsf-api/3.0-beta3/bsf-api-3.0-beta3.jar:"/>
<br>+ <property name="java.specification.name" value="Java Platform API Specification"/>
<br>+ <property name="java.class.version" value="50.0"/>
<br>+ <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
<br>+ <property name="os.version" value="10.6.2"/>
<br>+ <property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
<br>+ <property name="user.home" value="/Users/henri"/>
<br>+ <property name="user.timezone" value=""/>
<br>+ <property name="java.awt.printerjob" value="apple.awt.CPrinterJob"/>
<br>+ <property name="java.specification.version" value="1.6"/>
<br>+ <property name="file.encoding" value="MacRoman"/>
<br>+ <property name="user.name" value="henri"/>
<br>+ <property name="java.class.path" value="/Users/henri/Java/apache-commons/commons-parent-12/jexl-2.0/compat/commons-jexl-compat/target/test-classes:/Users/henri/Java/apache-commons/commons-parent-12/jexl-2.0/compat/commons-jexl-compat/target/classes:/Users/henri/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar:/Users/henri/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar:/Users/henri/.m2/repository/org/apache/commons/commons-jexl/2.0-SNAPSHOT/commons-jexl-2.0-SNAPSHOT.jar:/Users/henri/.m2/repository/org/apache/bsf/bsf-api/3.0-beta3/bsf-api-3.0-beta3.jar:"/>
<br>+ <property name="java.vm.specification.version" value="1.0"/>
<br>+ <property name="sun.arch.data.model" value="64"/>
<br>+ <property name="java.home" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home"/>
<br>+ <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
<br>+ <property name="user.language" value="en"/>
<br>+ <property name="awt.toolkit" value="apple.awt.CToolkit"/>
<br>+ <property name="java.vm.info" value="mixed mode"/>
<br>+ <property name="java.version" value="1.6.0_15"/>
<br>+ <property name="java.ext.dirs" value="/Library/Java/Extensions:/System/Library/Java/Extensions:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/lib/ext"/>
<br>+ <property name="sun.boot.class.path" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jsfd.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Resources/Java/JavaRuntimeSupport.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/laf.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/sunrsasign.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jsse.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jce.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/charsets.jar"/>
<br>+ <property name="java.vendor" value="Apple Inc."/>
<br>+ <property name="localRepository" value="/Users/henri/.m2/repository"/>
<br>+ <property name="file.separator" value="/"/>
<br>+ <property name="java.vendor.url.bug" value="<a href="http://bugreport.apple.com/" target="_top" rel="nofollow">http://bugreport.apple.com/</a>"/>
<br>+ <property name="sun.cpu.endian" value="little"/>
<br>+ <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<br>+ <property name="mrj.version" value="1060.1.6.0_15-219"/>
<br>+ <property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
<br>+ <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
<br>+ <property name="sun.cpu.isalist" value=""/>
<br>+ </properties>
<br>+ <testcase time="0.096" classname="org.apache.commons.jexl.ScriptTest" name="testSimpleScript"/>
<br>+ <testcase time="0.015" classname="org.apache.commons.jexl.ScriptTest" name="testScriptFromFile"/>
<br>+ <testcase time="0.003" classname="org.apache.commons.jexl.ScriptTest" name="testScriptFromURL"/>
<br>+ <testcase time="0.002" classname="org.apache.commons.jexl.ScriptTest" name="testScriptUpdatesContext"/>
<br>+</testsuite>
<br>\ No newline at end of file
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/TEST-org.apache.commons.jexl.ScriptTest.xml
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/org.apache.commons.jexl.ScriptTest.txt
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/org.apache.commons.jexl.ScriptTest.txt?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/org.apache.commons.jexl.ScriptTest.txt?rev=885754&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/org.apache.commons.jexl.ScriptTest.txt (added)
<br>+++ commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/org.apache.commons.jexl.ScriptTest.txt Tue Dec 1 12:47:00 2009
<br>@@ -0,0 +1,4 @@
<br>+-------------------------------------------------------------------------------
<br>+Test set: org.apache.commons.jexl.ScriptTest
<br>+-------------------------------------------------------------------------------
<br>+Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.141 sec
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/surefire-reports/org.apache.commons.jexl.ScriptTest.txt
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/jexl/ScriptTest$Tester.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/jexl/ScriptTest%24Tester.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/jexl/ScriptTest%24Tester.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/jexl/ScriptTest$Tester.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Added: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/jexl/ScriptTest.class
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/jexl/ScriptTest.class?rev=885754&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/jexl/ScriptTest.class?rev=885754&view=auto</a><br>==============================================================================
<br>Binary file - no diff available.
<br><br>Propchange: commons/proper/jexl/trunk/compat/commons-jexl-compat/target/test-classes/org/apache/commons/jexl/ScriptTest.class
<br>------------------------------------------------------------------------------
<br> svn:mime-type = application/octet-stream
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java?rev=885754&r1=885753&r2=885754&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java?rev=885754&r1=885753&r2=885754&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/ExpressionImpl.java Tue Dec 1 12:47:00 2009
<br>@@ -23,12 +23,11 @@
<br> * Instances of ExpressionImpl are created by the {@link JexlEngine},
<br> * and this is the default implementation of the {@link Expression} and
<br> * {@link Script} interface.
<br>- *
<br> * @since 1.0
<br> * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26591167&i=4" target="_top" rel="nofollow">geirm@...</a>">Geir Magnusson Jr.</a>
<br> * @version $Id$
<br> */
<br>-class ExpressionImpl implements Expression, Script {
<br>+public class ExpressionImpl implements Expression, Script {
<br> /** The engine for this expression. */
<br> protected final JexlEngine jexl;
<br> /**
<br>@@ -48,10 +47,10 @@
<br> * @param expr the expression.
<br> * @param ref the parsed expression.
<br> */
<br>- ExpressionImpl(JexlEngine engine, String expr, ASTJexlScript ref) {
<br>+ protected ExpressionImpl(JexlEngine engine, String expr, ASTJexlScript ref) {
<br>+ jexl = engine;
<br> expression = expr;
<br> script = ref;
<br>- jexl = engine;
<br> }
<br>
<br> /**
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java?rev=885754&r1=885753&r2=885754&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java?rev=885754&r1=885753&r2=885754&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java Tue Dec 1 12:47:00 2009
<br>@@ -91,7 +91,7 @@
<br> /**
<br> * An empty/static/non-mutable JexlContext used instead of null context.
<br> */
<br>- protected static final JexlContext EMPTY_CONTEXT = new JexlContext() {
<br>+ public static final JexlContext EMPTY_CONTEXT = new JexlContext() {
<br> /** {@inheritDoc} */
<br> public Object get(String name) {
<br> return null;
<br>@@ -115,9 +115,11 @@
<br> * <p>Implemented as on demand holder idiom.</p>
<br> * @return Uberspect the default uberspector instance.
<br> */
<br>- private static class UberspectHolder {
<br>+ private static final class UberspectHolder {
<br> /** The default uberspector that handles all introspection patterns. */
<br> private static final Uberspect UBERSPECT = new UberspectImpl(LogFactory.getLog(JexlEngine.class));
<br>+ /** Non-instantiable. */
<br>+ private UberspectHolder() {}
<br> }
<br>
<br> /**
<br>@@ -338,6 +340,16 @@
<br> }
<br>
<br> /**
<br>+ * An overridable through covariant return Expression creator.
<br>+ * @param text the script text
<br>+ * @param tree the parse AST tree
<br>+ * @return the script instance
<br>+ */
<br>+ protected Expression createExpression(ASTJexlScript tree, String text) {
<br>+ return new ExpressionImpl(this, text, tree);
<br>+ }
<br>+
<br>+ /**
<br> * Creates an Expression from a String containing valid
<br> * JEXL syntax. This method parses the expression which
<br> * must contain either a reference or an expression.
<br>@@ -369,7 +381,7 @@
<br> logger.warn("The JEXL Expression created will be a reference"
<br> + " to the first expression from the supplied script: \"" + expression + "\" ");
<br> }
<br>- return new ExpressionImpl(this, expression, tree);
<br>+ return createExpression(tree, expression);
<br> }
<br>
<br> /**
<br>@@ -399,10 +411,20 @@
<br> }
<br> // Parse the expression
<br> ASTJexlScript tree = parse(scriptText, info);
<br>- return new ExpressionImpl(this, scriptText, tree);
<br>+ return createScript(tree, scriptText);
<br> }
<br>
<br> /**
<br>+ * An overridable through covariant return Script creator.
<br>+ * @param text the script text
<br>+ * @param tree the parse AST tree
<br>+ * @return the script instance
<br>+ */
<br>+ protected Script createScript(ASTJexlScript tree, String text) {
<br>+ return new ExpressionImpl(this, text, tree);
<br>+ }
<br>+
<br>+ /**
<br> * Creates a Script from a {@link File} containing valid JEXL syntax.
<br> * This method parses the script and validates the syntax.
<br> *
<br>@@ -426,7 +448,6 @@
<br> info = createInfo(scriptFile.getName(), 0, 0);
<br> }
<br> return createScript(readerToString(reader), info);
<br>-
<br> }
<br>
<br> /**
<br>@@ -833,10 +854,6 @@
<br> clazz = JexlEngine.class;
<br> } else if (className.equals(UnifiedJEXL.class.getName())) {
<br> clazz = UnifiedJEXL.class;
<br>- } else if (className.equals(ScriptFactory.class.getName())) {
<br>- clazz = ScriptFactory.class;
<br>- } else if (className.equals(ExpressionFactory.class.getName())) {
<br>- clazz = ExpressionFactory.class;
<br> } else {
<br> break;
<br> }
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java?rev=885754&r1=885753&r2=885754&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java?rev=885754&r1=885753&r2=885754&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java Tue Dec 1 12:47:00 2009
<br>@@ -52,14 +52,8 @@
<br> * Test creating a script from a string.
<br> */
<br> public void testSimpleScript() throws Exception {
<br>- simpleScript(true);
<br>- }
<br>- public void testLegacySimpleScript() throws Exception {
<br>- simpleScript(false);
<br>- }
<br>- private void simpleScript(boolean jexl) throws Exception {
<br> String code = "while (x < 10) x = x + 1;";
<br>- Script s = jexl? JEXL.createScript(code) : ScriptFactory.createScript(code);
<br>+ Script s = JEXL.createScript(code);
<br> JexlContext jc = new MapContext();
<br> jc.set("x", new Integer(1));
<br>
<br>@@ -69,14 +63,8 @@
<br> }
<br>
<br> public void testScriptFromFile() throws Exception {
<br>- scriptFromFile(true);
<br>- }
<br>- public void testLegacyScriptFromFile() throws Exception {
<br>- scriptFromFile(false);
<br>- }
<br>- private void scriptFromFile(boolean jexl) throws Exception {
<br> File testScript = new File(TEST1);
<br>- Script s = jexl? JEXL.createScript(testScript) : ScriptFactory.createScript(testScript);
<br>+ Script s = JEXL.createScript(testScript);
<br> JexlContext jc = new MapContext();
<br> jc.set("out", System.out);
<br> Object result = s.execute(jc);
<br>@@ -85,14 +73,8 @@
<br> }
<br>
<br> public void testScriptFromURL() throws Exception {
<br>- scriptFromURL(true);
<br>- }
<br>- public void testLegacyScriptFromURL() throws Exception {
<br>- scriptFromURL(false);
<br>- }
<br>- private void scriptFromURL(boolean jexl) throws Exception {
<br> URL testUrl = new File("src/test/scripts/test1.jexl").toURI().toURL();
<br>- Script s = jexl? JEXL.createScript(testUrl) : ScriptFactory.createScript(testUrl);
<br>+ Script s = JEXL.createScript(testUrl);
<br> JexlContext jc = new MapContext();
<br> jc.set("out", System.out);
<br> Object result = s.execute(jc);
<br>@@ -101,15 +83,9 @@
<br> }
<br>
<br> public void testScriptUpdatesContext() throws Exception {
<br>- scriptUpdatesContext(true);
<br>- }
<br>- public void testLegacyScriptUpdatesContext() throws Exception {
<br>- scriptUpdatesContext(false);
<br>- }
<br>- private void scriptUpdatesContext(boolean jexl) throws Exception {
<br> String jexlCode = "resultat.setCode('OK')";
<br>- Expression e = jexl? JEXL.createExpression(jexlCode) : ExpressionFactory.createExpression(jexlCode);
<br>- Script s = jexl? JEXL.createScript(jexlCode) : ScriptFactory.createScript(jexlCode);
<br>+ Expression e = JEXL.createExpression(jexlCode);
<br>+ Script s = JEXL.createScript(jexlCode);
<br>
<br> Tester resultatJexl = new Tester();
<br> JexlContext jc = new MapContext();
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26580473
svn commit: r885553 [2/2] - in /commons/proper/jexl/trunk: src/main/java/org/apache/commons/jexl2/ src/main/java/org/apache/commons/jexl2/introspection/ src/main/java/org/apache/commons/jexl2/parser/ src/main/java/org/apache/commons/jexl2/scripting/ sr...
2009-11-30T11:28:41Z
2009-11-30T11:28:41Z
henrib-2
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java Mon Nov 30 19:28:40 2009
<br>@@ -259,7 +259,7 @@
<br> jexl.setCache(0);
<br> }
<br> Map<String, Object> vars = new HashMap<String,Object>();
<br>- JexlContext jc = new JexlContext.Mapped(vars);
<br>+ JexlContext jc = new MapContext(vars);
<br> Expression cacheGetValue = jexl.createExpression("cache.value");
<br> Expression cacheSetValue = jexl.createExpression("cache.value = value");
<br> Object result;
<br>@@ -318,7 +318,7 @@
<br> jexl.setCache(0);
<br> }
<br> Map<String, Object> vars = new HashMap<String,Object>();
<br>- JexlContext jc = new JexlContext.Mapped(vars);
<br>+ JexlContext jc = new MapContext(vars);
<br> Expression cacheGetValue = jexl.createExpression("cache.flag");
<br> Expression cacheSetValue = jexl.createExpression("cache.flag = value");
<br> Object result;
<br>@@ -359,7 +359,7 @@
<br> jexl.setCache(0);
<br> }
<br> Map<String, Object> vars = new HashMap<String,Object>();
<br>- JexlContext jc = new JexlContext.Mapped(vars);
<br>+ JexlContext jc = new MapContext(vars);
<br> Expression cacheGetValue = jexl.createExpression("cache.0");
<br> Expression cacheSetValue = jexl.createExpression("cache[0] = value");
<br> Object result;
<br>@@ -414,7 +414,7 @@
<br> jexl.setCache(0);
<br> }
<br> Map<String, Object> vars = new HashMap<String,Object>();
<br>- JexlContext jc = new JexlContext.Mapped(vars);
<br>+ JexlContext jc = new MapContext(vars);
<br> jexl.setDebug(true);
<br> Expression compute2 = jexl.createExpression("cache.compute(a0, a1)");
<br> Expression compute1 = jexl.createExpression("cache.compute(a0)");
<br>@@ -513,7 +513,7 @@
<br> jexl.setCache(0);
<br> }
<br> Map<String, Object> vars = new HashMap<String,Object>();
<br>- JexlContext jc = new JexlContext.Mapped(vars);
<br>+ JexlContext jc = new MapContext(vars);
<br> java.util.Map<String, Object> funcs = new java.util.HashMap<String, Object>();
<br> jexl.setFunctions(funcs);
<br> Expression compute2 = jexl.createExpression("cached:COMPUTE(a0, a1)");
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java Mon Nov 30 19:28:40 2009
<br>@@ -112,7 +112,7 @@
<br> // List<Object> mm = new ArrayList<Object>();
<br> Expression expr = jexl.createExpression("foo.value");
<br> Expression newx = jexl.createExpression("foo = new(clazz)");
<br>- JexlContext context = new JexlContext.Mapped();
<br>+ JexlContext context = new MapContext();
<br>
<br> ClassCreator cctor = new ClassCreator(jexl, base);
<br> for (int i = 0; i < LOOPS && gced < 0; ++i) {
<br>@@ -132,12 +132,12 @@
<br> // Method m = clazz.getDeclaredMethod("getValue", new Class<?>[0]);
<br> // mm.add(m);
<br> // we should not be able to create foox since it is unknown to the Jexl classloader
<br>- context.setJexlVariable("clazz", cctor.getClassName());
<br>- context.setJexlVariable("foo", null);
<br>+ context.set("clazz", cctor.getClassName());
<br>+ context.set("foo", null);
<br> Object z = newx.evaluate(context);
<br> assertNull(z);
<br> // check with the class itself
<br>- context.setJexlVariable("clazz", clazz);
<br>+ context.set("clazz", clazz);
<br> z = newx.evaluate(context);
<br> assertNotNull(clazz + ": class " + i + " could not be instantiated on pass " + pass, z);
<br> assertEquals(new Integer(i), expr.evaluate(context));
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.java Mon Nov 30 19:28:40 2009
<br>@@ -37,7 +37,7 @@
<br>
<br> public void testForEachWithEmptyStatement() throws Exception {
<br> Expression e = JEXL.createExpression("for(item : list) ;");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate(jc);
<br> assertNull("Result is not null", o);
<br>@@ -45,7 +45,7 @@
<br>
<br> public void testForEachWithEmptyList() throws Exception {
<br> Expression e = JEXL.createExpression("for(item : list) 1+1");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate(jc);
<br> assertNull("Result is not null", o);
<br>@@ -53,78 +53,78 @@
<br>
<br> public void testForEachWithArray() throws Exception {
<br> Expression e = JEXL.createExpression("for(item : list) item");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("list", new Object[] {"Hello", "World"});
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("list", new Object[] {"Hello", "World"});
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not last evaluated expression", "World", o);
<br> }
<br>
<br> public void testForEachWithCollection() throws Exception {
<br> Expression e = JEXL.createExpression("for(item : list) item");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("list", Arrays.asList(new Object[] {"Hello", "World"}));
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("list", Arrays.asList(new Object[] {"Hello", "World"}));
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not last evaluated expression", "World", o);
<br> }
<br>
<br> public void testForEachWithEnumeration() throws Exception {
<br> Expression e = JEXL.createExpression("for(item : list) item");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("list", new StringTokenizer("Hello,World", ","));
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("list", new StringTokenizer("Hello,World", ","));
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not last evaluated expression", "World", o);
<br> }
<br>
<br> public void testForEachWithIterator() throws Exception {
<br> Expression e = JEXL.createExpression("for(item : list) item");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("list", Arrays.asList(new Object[] {"Hello", "World"}).iterator());
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("list", Arrays.asList(new Object[] {"Hello", "World"}).iterator());
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not last evaluated expression", "World", o);
<br> }
<br>
<br> public void testForEachWithMap() throws Exception {
<br> Expression e = JEXL.createExpression("for(item : list) item");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Map<?, ?> map = System.getProperties();
<br> String lastProperty = (String) new ArrayList<Object>(map.values()).get(System.getProperties().size() - 1);
<br>- jc.setJexlVariable("list", map);
<br>+ jc.set("list", map);
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not last evaluated expression", lastProperty, o);
<br> }
<br>
<br> public void testForEachWithBlock() throws Exception {
<br> Expression e = JEXL.createExpression("for(item : list) { x = x + item; }");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("list", new Object[] {"1", "1"});
<br>- jc.setJexlVariable("x", new Integer(0));
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("list", new Object[] {"1", "1"});
<br>+ jc.set("x", new Integer(0));
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is wrong", new Integer(2), o);
<br>- assertEquals("x is wrong", new Integer(2), jc.getJexlVariable("x"));
<br>+ assertEquals("x is wrong", new Integer(2), jc.get("x"));
<br> }
<br>
<br> public void testForEachWithListExpression() throws Exception {
<br> Expression e = JEXL.createExpression("for(item : list.keySet()) item");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Map<?, ?> map = System.getProperties();
<br> String lastKey = (String) new ArrayList<Object>(map.keySet()).get(System.getProperties().size() - 1);
<br>- jc.setJexlVariable("list", map);
<br>+ jc.set("list", map);
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not last evaluated expression", lastKey, o);
<br> }
<br>
<br> public void testForEachWithProperty() throws Exception {
<br> Expression e = JEXL.createExpression("for(item : list.cheeseList) item");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("list", new Foo());
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("list", new Foo());
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not last evaluated expression", "brie", o);
<br> }
<br>
<br> public void testForEachWithIteratorMethod() throws Exception {
<br> Expression e = JEXL.createExpression("for(item : list.cheezy) item");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("list", new Foo());
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("list", new Foo());
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not last evaluated expression", "brie", o);
<br> }
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.java Mon Nov 30 19:28:40 2009
<br>@@ -37,7 +37,7 @@
<br> */
<br> public void testSimpleIfTrue() throws Exception {
<br> Expression e = JEXL.createExpression("if (true) 1");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not 1", new Integer(1), o);
<br>@@ -50,7 +50,7 @@
<br> */
<br> public void testSimpleIfFalse() throws Exception {
<br> Expression e = JEXL.createExpression("if (false) 1");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate(jc);
<br> assertNull("Return value is not empty", o);
<br>@@ -64,7 +64,7 @@
<br> public void testSimpleElse() throws Exception {
<br> Expression e = JEXL
<br> .createExpression("if (false) 1 else 2;");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not 2", new Integer(2), o);
<br>@@ -78,7 +78,7 @@
<br> public void testBlockIfTrue() throws Exception {
<br> Expression e = JEXL
<br> .createExpression("if (true) { 'hello'; }");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is wrong", "hello", o);
<br>@@ -92,7 +92,7 @@
<br> public void testBlockElse() throws Exception {
<br> Expression e = JEXL
<br> .createExpression("if (false) {1} else {2 ; 3}");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is wrong", new Integer(3), o);
<br>@@ -106,8 +106,8 @@
<br> public void testIfWithSimpleExpression() throws Exception {
<br> Expression e = JEXL
<br> .createExpression("if (x == 1) true;");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("x", new Integer(1));
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("x", new Integer(1));
<br>
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not true", Boolean.TRUE, o);
<br>@@ -121,8 +121,8 @@
<br> public void testIfWithArithmeticExpression() throws Exception {
<br> Expression e = JEXL
<br> .createExpression("if ((x * 2) + 1 == 5) true;");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("x", new Integer(2));
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("x", new Integer(2));
<br>
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not true", Boolean.TRUE, o);
<br>@@ -136,8 +136,8 @@
<br> public void testIfWithDecimalArithmeticExpression() throws Exception {
<br> Expression e = JEXL
<br> .createExpression("if ((x * 2) == 5) true");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("x", new Float(2.5f));
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("x", new Float(2.5f));
<br>
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not true", Boolean.TRUE, o);
<br>@@ -151,11 +151,11 @@
<br> public void testIfWithAssignment() throws Exception {
<br> Expression e = JEXL
<br> .createExpression("if ((x * 2) == 5) {y = 1} else {y = 2;}");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("x", new Float(2.5f));
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("x", new Float(2.5f));
<br>
<br> e.evaluate(jc);
<br>- Object result = jc.getJexlVariable("y");
<br>+ Object result = jc.get("y");
<br> assertEquals("y has the wrong value", new Integer(1), result);
<br> }
<br>
<br>@@ -167,7 +167,7 @@
<br> public void testTernary() throws Exception {
<br> JexlEngine jexl = new JexlEngine();
<br> jexl.setCache(64);
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Expression e = jexl.createExpression("x.y.z = foo ?'bar':'quux'");
<br> Object o;
<br>
<br>@@ -178,40 +178,40 @@
<br> jexl.setSilent((l & 2) != 0);
<br> o = e.evaluate(jc);
<br> assertEquals("Should be quux", "quux", o);
<br>- o = jc.getJexlVariable("x.y.z");
<br>+ o = jc.get("x.y.z");
<br> assertEquals("Should be quux", "quux", o);
<br> }
<br>
<br>- jc.setJexlVariable("foo", null);
<br>+ jc.set("foo", null);
<br>
<br> for(int l = 0; l < 4; ++l) {
<br> jexl.setLenient((l & 1) != 0);
<br> jexl.setSilent((l & 2) != 0);
<br> o = e.evaluate(jc);
<br> assertEquals("Should be quux", "quux", o);
<br>- o = jc.getJexlVariable("x.y.z");
<br>+ o = jc.get("x.y.z");
<br> assertEquals("Should be quux", "quux", o);
<br> }
<br>
<br>- jc.setJexlVariable("foo",Boolean.FALSE);
<br>+ jc.set("foo",Boolean.FALSE);
<br>
<br> for(int l = 0; l < 4; ++l) {
<br> jexl.setLenient((l & 1) != 0);
<br> jexl.setSilent((l & 2) != 0);
<br> o = e.evaluate(jc);
<br> assertEquals("Should be quux", "quux", o);
<br>- o = jc.getJexlVariable("x.y.z");
<br>+ o = jc.get("x.y.z");
<br> assertEquals("Should be quux", "quux", o);
<br> }
<br>
<br>- jc.setJexlVariable("foo",Boolean.TRUE);
<br>+ jc.set("foo",Boolean.TRUE);
<br>
<br> for(int l = 0; l < 4; ++l) {
<br> jexl.setLenient((l & 1) != 0);
<br> jexl.setSilent((l & 2) != 0);
<br> o = e.evaluate(jc);
<br> assertEquals("Should be bar", "bar", o);
<br>- o = jc.getJexlVariable("x.y.z");
<br>+ o = jc.get("x.y.z");
<br> assertEquals("Should be bar", "bar", o);
<br> }
<br>
<br>@@ -226,7 +226,7 @@
<br> public void testTernaryShorthand() throws Exception {
<br> JexlEngine jexl = new JexlEngine();
<br> jexl.setCache(64);
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Expression e = JEXL.createExpression("x.y.z = foo?:'quux'");
<br> Object o;
<br>
<br>@@ -237,40 +237,40 @@
<br> jexl.setSilent((l & 2) != 0);
<br> o = e.evaluate(jc);
<br> assertEquals("Should be quux", "quux", o);
<br>- o = jc.getJexlVariable("x.y.z");
<br>+ o = jc.get("x.y.z");
<br> assertEquals("Should be quux", "quux", o);
<br> }
<br>
<br>- jc.setJexlVariable("foo", null);
<br>+ jc.set("foo", null);
<br>
<br> for(int l = 0; l < 4; ++l) {
<br> jexl.setLenient((l & 1) != 0);
<br> jexl.setSilent((l & 2) != 0);
<br> o = e.evaluate(jc);
<br> assertEquals("Should be quux", "quux", o);
<br>- o = jc.getJexlVariable("x.y.z");
<br>+ o = jc.get("x.y.z");
<br> assertEquals("Should be quux", "quux", o);
<br> }
<br>
<br>- jc.setJexlVariable("foo", Boolean.FALSE);
<br>+ jc.set("foo", Boolean.FALSE);
<br>
<br> for(int l = 0; l < 4; ++l) {
<br> jexl.setLenient((l & 1) != 0);
<br> jexl.setSilent((l & 2) != 0);
<br> o = e.evaluate(jc);
<br> assertEquals("Should be quux", "quux", o);
<br>- o = jc.getJexlVariable("x.y.z");
<br>+ o = jc.get("x.y.z");
<br> assertEquals("Should be quux", "quux", o);
<br> }
<br>
<br>- jc.setJexlVariable("foo","bar");
<br>+ jc.set("foo","bar");
<br>
<br> for(int l = 0; l < 4; ++l) {
<br> jexl.setLenient((l & 1) != 0);
<br> jexl.setSilent((l & 2) != 0);
<br> o = e.evaluate(jc);
<br> assertEquals("Should be bar", "bar", o);
<br>- o = jc.getJexlVariable("x.y.z");
<br>+ o = jc.get("x.y.z");
<br> assertEquals("Should be bar", "bar", o);
<br> }
<br>
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java Mon Nov 30 19:28:40 2009
<br>@@ -15,7 +15,8 @@
<br> * limitations under the License.
<br> */
<br> package org.apache.commons.jexl2;
<br>-
<br>+import org.apache.commons.jexl2.introspection.Uberspect;
<br>+import org.apache.commons.jexl2.util.Introspector;
<br> import java.util.HashMap;
<br> import java.util.Map;
<br>
<br>@@ -32,7 +33,7 @@
<br> // JEXL-49: blocks not parsed (fixed)
<br> public void test49() throws Exception {
<br> Map<String,Object> vars = new HashMap<String,Object>();
<br>- JexlContext ctxt = new JexlContext.Mapped(vars);
<br>+ JexlContext ctxt = new MapContext(vars);
<br> String stmt = "{a = 'b'; c = 'd';}";
<br> Script expr = JEXL.createScript(stmt);
<br> /* Object value = */ expr.execute(ctxt);
<br>@@ -70,8 +71,8 @@
<br> jexl.setSilent(false);
<br> String jexlExp = "(foo.getInner().foo() eq true) and (foo.getInner().goo() = (foo.getInner().goo()+1-1))";
<br> Expression e = jexl.createExpression(jexlExp);
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", new Foo());
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("foo", new Foo());
<br>
<br> try {
<br> /* Object o = */ e.evaluate(jc);
<br>@@ -87,7 +88,7 @@
<br> JexlEngine jexl = new JexlEngine();
<br> // ensure errors will throw
<br> jexl.setSilent(false);
<br>- JexlContext ctxt = new JexlContext.Mapped();
<br>+ JexlContext ctxt = new MapContext();
<br>
<br> Expression expr = jexl.createExpression("true//false\n");
<br> Object value = expr.evaluate(ctxt);
<br>@@ -109,8 +110,8 @@
<br> UnifiedJEXL uel = new UnifiedJEXL(jexl);
<br> // ensure errors will throw
<br> //jexl.setSilent(false);
<br>- JexlContext ctxt = new JexlContext.Mapped();
<br>- ctxt.setJexlVariable("ax", "ok");
<br>+ JexlContext ctxt = new MapContext();
<br>+ ctxt.set("ax", "ok");
<br>
<br> UnifiedJEXL.Expression expr = uel.parse("${ax+(bx)}");
<br> Object value = expr.evaluate(ctxt);
<br>@@ -134,8 +135,8 @@
<br> JexlEngine jexl = new JexlEngine();
<br> // ensure errors will throw
<br> jexl.setSilent(false);
<br>- JexlContext ctxt = new JexlContext.Mapped();
<br>- ctxt.setJexlVariable("derived", new Derived());
<br>+ JexlContext ctxt = new MapContext();
<br>+ ctxt.set("derived", new Derived());
<br>
<br> Expression expr = jexl.createExpression("derived.foo()");
<br> Object value = expr.evaluate(ctxt);
<br>@@ -145,8 +146,9 @@
<br> // JEXL-52: can be implemented by deriving Interpreter.{g,s}etAttribute; later
<br> public void test52base() throws Exception {
<br> JexlEngine jexl = new JexlEngine();
<br>+ Uberspect uber = jexl.getUberspect();
<br> // most likely, call will be in an Interpreter, getUberspect
<br>- String[] names = jexl.uberspect.getIntrospector().getMethodNames(Another.class);
<br>+ String[] names = ((Introspector) uber).getMethodNames(Another.class);
<br> assertTrue("should find methods", names.length > 0);
<br> int found = 0;
<br> for (String name : names) {
<br>@@ -163,8 +165,8 @@
<br> // ensure errors will throw
<br> jexl.setSilent(false);
<br> jexl.setLenient(false);
<br>- JexlContext ctxt = new JexlContext.Mapped();
<br>- ctxt.setJexlVariable("a", null);
<br>+ JexlContext ctxt = new MapContext();
<br>+ ctxt.set("a", null);
<br>
<br> String[] exprs = {
<br> //"10 + null",
<br>@@ -192,11 +194,11 @@
<br>
<br> Script jscript;
<br>
<br>- ctxt = new JexlContext.Mapped();
<br>+ ctxt = new MapContext();
<br> jscript = jexl.createScript("dummy.hashCode()");
<br> assertEquals(jscript.getText(), null, jscript.execute(ctxt)); // OK
<br>
<br>- ctxt.setJexlVariable("dummy", "abcd");
<br>+ ctxt.set("dummy", "abcd");
<br> assertEquals(jscript.getText(), Integer.valueOf("abcd".hashCode()), jscript.execute(ctxt)); // OK
<br>
<br> jscript = jexl.createScript("dummy.hashCode");
<br>@@ -204,11 +206,11 @@
<br>
<br> Expression jexpr;
<br>
<br>- ctxt = new JexlContext.Mapped();
<br>+ ctxt = new MapContext();
<br> jexpr = jexl.createExpression("dummy.hashCode()");
<br> assertEquals(jexpr.getExpression(), null, jexpr.evaluate(ctxt)); // OK
<br>
<br>- ctxt.setJexlVariable("dummy", "abcd");
<br>+ ctxt.set("dummy", "abcd");
<br> assertEquals(jexpr.getExpression(), Integer.valueOf("abcd".hashCode()), jexpr.evaluate(ctxt)); // OK
<br>
<br> jexpr = jexl.createExpression("dummy.hashCode");
<br>@@ -217,7 +219,7 @@
<br>
<br> // JEXL-73
<br> public void test73() throws Exception {
<br>- JexlContext ctxt = new JexlContext.Mapped();
<br>+ JexlContext ctxt = new MapContext();
<br> JexlEngine jexl = new JexlEngine();
<br> jexl.setSilent(false);
<br> jexl.setLenient(false);
<br>@@ -230,8 +232,8 @@
<br> assertTrue(msg.indexOf("variable c.e") > 0);
<br> }
<br>
<br>- ctxt.setJexlVariable("c", "{ 'a' : 3, 'b' : 5}");
<br>- ctxt.setJexlVariable("e", Integer.valueOf(2));
<br>+ ctxt.set("c", "{ 'a' : 3, 'b' : 5}");
<br>+ ctxt.set("e", Integer.valueOf(2));
<br> try {
<br> /* Object o = */ e.evaluate(ctxt);
<br> } catch (JexlException xjexl) {
<br>@@ -243,27 +245,27 @@
<br>
<br> // JEXL-87
<br> public void test87() throws Exception {
<br>- JexlContext ctxt = new JexlContext.Mapped();
<br>+ JexlContext ctxt = new MapContext();
<br> JexlEngine jexl = new JexlEngine();
<br> jexl.setSilent(false);
<br> jexl.setLenient(false);
<br> Expression divide = jexl.createExpression("l / r");
<br> Expression modulo = jexl.createExpression("l % r");
<br>
<br>- ctxt.setJexlVariable("l", java.math.BigInteger.valueOf(7));
<br>- ctxt.setJexlVariable("r", java.math.BigInteger.valueOf(2));
<br>+ ctxt.set("l", java.math.BigInteger.valueOf(7));
<br>+ ctxt.set("r", java.math.BigInteger.valueOf(2));
<br> assertEquals("3", divide.evaluate(ctxt).toString());
<br> assertEquals("1", modulo.evaluate(ctxt).toString());
<br>
<br>- ctxt.setJexlVariable("l", java.math.BigDecimal.valueOf(7));
<br>- ctxt.setJexlVariable("r", java.math.BigDecimal.valueOf(2));
<br>+ ctxt.set("l", java.math.BigDecimal.valueOf(7));
<br>+ ctxt.set("r", java.math.BigDecimal.valueOf(2));
<br> assertEquals("3.5", divide.evaluate(ctxt).toString());
<br> assertEquals("1", modulo.evaluate(ctxt).toString());
<br> }
<br>
<br> // JEXL-90
<br> public void test90() throws Exception {
<br>- JexlContext ctxt = new JexlContext.Mapped();
<br>+ JexlContext ctxt = new MapContext();
<br> JexlEngine jexl = new JexlEngine();
<br> jexl.setSilent(false);
<br> jexl.setLenient(false);
<br>@@ -292,8 +294,8 @@
<br> "for(z : [3, 4, 5]) { z } y ? 2 : 1",
<br> "for(z : [3, 4, 5]) { z } if (y) 2 else 1"
<br> };
<br>- ctxt.setJexlVariable("x", Boolean.FALSE);
<br>- ctxt.setJexlVariable("y", Boolean.TRUE);
<br>+ ctxt.set("x", Boolean.FALSE);
<br>+ ctxt.set("y", Boolean.TRUE);
<br> for (int e = 0; e < exprs.length; ++e) {
<br> Script s = jexl.createScript(exprs[e]);
<br> assertEquals(Integer.valueOf(2), s.execute(ctxt));
<br>@@ -303,7 +305,7 @@
<br>
<br> // JEXL-44
<br> public void test44() throws Exception {
<br>- JexlContext ctxt = new JexlContext.Mapped();
<br>+ JexlContext ctxt = new MapContext();
<br> JexlEngine jexl = new JexlEngine();
<br> jexl.setSilent(false);
<br> jexl.setLenient(false);
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Jexl.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Jexl.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Jexl.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Jexl.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Jexl.java Mon Nov 30 19:28:40 2009
<br>@@ -28,9 +28,12 @@
<br>
<br> public static void main(String[] args) {
<br> final JexlEngine JEXL = new JexlEngine();
<br>- Map m = System.getProperties();
<br>+ Map<Object,Object> m = System.getProperties();
<br> // dummy context to get variables
<br>- JexlContext context = new JexlContext.Mapped(System.getProperties());
<br>+ JexlContext context = new MapContext();
<br>+ for(Map.Entry<Object,Object> e : m.entrySet()) {
<br>+ context.set(e.getKey().toString(), e.getValue());
<br>+ }
<br> try {
<br> for (int i = 0; i < args.length; i++) {
<br> Expression e = JEXL.createExpression(args[i]);
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.java Mon Nov 30 19:28:40 2009
<br>@@ -61,9 +61,9 @@
<br> */
<br>
<br> Expression e = JEXL.createExpression("foo.bar");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br>- jc.setJexlVariable("foo", new Foo() );
<br>+ jc.set("foo", new Foo() );
<br> Object o = e.evaluate(jc);
<br>
<br> assertTrue("o not instanceof String", o instanceof String);
<br>@@ -73,10 +73,10 @@
<br> public void testBoolean()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", new Foo() );
<br>- jc.setJexlVariable("a", Boolean.TRUE);
<br>- jc.setJexlVariable("b", Boolean.FALSE);
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("foo", new Foo() );
<br>+ jc.set("a", Boolean.TRUE);
<br>+ jc.set("b", Boolean.FALSE);
<br>
<br> assertExpression(jc, "foo.convertBoolean(a==b)", "Boolean : false");
<br> assertExpression(jc, "foo.convertBoolean(a==true)", "Boolean : true");
<br>@@ -92,24 +92,24 @@
<br> /*
<br> * tests a simple property expression
<br> */
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", new Foo() );
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("foo", new Foo() );
<br> assertExpression(jc, "foo.get(\"woogie\")", "Repeat : woogie");
<br> }
<br>
<br> public void testExpression()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", new Foo() );
<br>- jc.setJexlVariable("a", Boolean.TRUE);
<br>- jc.setJexlVariable("b", Boolean.FALSE);
<br>- jc.setJexlVariable("num", new Integer(5));
<br>- jc.setJexlVariable("now", Calendar.getInstance().getTime());
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("foo", new Foo() );
<br>+ jc.set("a", Boolean.TRUE);
<br>+ jc.set("b", Boolean.FALSE);
<br>+ jc.set("num", new Integer(5));
<br>+ jc.set("now", Calendar.getInstance().getTime());
<br> GregorianCalendar gc = new GregorianCalendar(5000, 11, 20);
<br>- jc.setJexlVariable("now2", gc.getTime());
<br>- jc.setJexlVariable("bdec", new BigDecimal("7"));
<br>- jc.setJexlVariable("bint", new BigInteger("7"));
<br>+ jc.set("now2", gc.getTime());
<br>+ jc.set("bdec", new BigDecimal("7"));
<br>+ jc.set("bint", new BigInteger("7"));
<br>
<br> assertExpression(jc, "a == b", Boolean.FALSE);
<br> assertExpression(jc, "a==true", Boolean.TRUE);
<br>@@ -161,13 +161,13 @@
<br> public void testEmpty()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("string", "");
<br>- jc.setJexlVariable("array", new Object[0]);
<br>- jc.setJexlVariable("map", new HashMap<Object, Object>());
<br>- jc.setJexlVariable("list", new ArrayList<Object>());
<br>- jc.setJexlVariable("set", (new HashMap<Object, Object>()).keySet());
<br>- jc.setJexlVariable("longstring", "thingthing");
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("string", "");
<br>+ jc.set("array", new Object[0]);
<br>+ jc.set("map", new HashMap<Object, Object>());
<br>+ jc.set("list", new ArrayList<Object>());
<br>+ jc.set("set", (new HashMap<Object, Object>()).keySet());
<br>+ jc.set("longstring", "thingthing");
<br>
<br> /*
<br> * I can't believe anyone thinks this is a syntax.. :)
<br>@@ -185,9 +185,9 @@
<br> public void testSize()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("s", "five!");
<br>- jc.setJexlVariable("array", new Object[5]);
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("s", "five!");
<br>+ jc.set("array", new Object[5]);
<br>
<br> Map<String, Integer> map = new HashMap<String, Integer>();
<br>
<br>@@ -197,7 +197,7 @@
<br> map.put("4", new Integer(4));
<br> map.put("5", new Integer(5));
<br>
<br>- jc.setJexlVariable("map", map);
<br>+ jc.set("map", map);
<br>
<br> List<String> list = new ArrayList<String>();
<br>
<br>@@ -207,18 +207,18 @@
<br> list.add("4");
<br> list.add("5");
<br>
<br>- jc.setJexlVariable("list", list);
<br>+ jc.set("list", list);
<br>
<br> // 30652 - support for set
<br> Set<String> set = new HashSet<String>();
<br> set.addAll(list);
<br> set.add("1");
<br>
<br>- jc.setJexlVariable("set", set);
<br>+ jc.set("set", set);
<br>
<br> // support generic int size() method
<br> BitSet bitset = new BitSet(5);
<br>- jc.setJexlVariable("bitset", bitset);
<br>+ jc.set("bitset", bitset);
<br>
<br> assertExpression(jc, "size(s)", new Integer(5));
<br> assertExpression(jc, "size(array)", new Integer(5));
<br>@@ -238,11 +238,11 @@
<br>
<br> public void testSizeAsProperty() throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Map<String, Object> map = new HashMap<String, Object>();
<br> map.put("size", "cheese");
<br>- jc.setJexlVariable("map", map);
<br>- jc.setJexlVariable("foo", new Foo());
<br>+ jc.set("map", map);
<br>+ jc.set("foo", new Foo());
<br>
<br> assertExpression(jc, "map['size']", "cheese");
<br> // PR - unsure whether or not we should support map.size or force usage of the above 'escaped' version
<br>@@ -256,9 +256,9 @@
<br> * test the new function e.g constructor invocation
<br> */
<br> public void testNew() throws Exception {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("double", Double.class);
<br>- jc.setJexlVariable("foo", "org.apache.commons.jexl2.Foo");
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("double", Double.class);
<br>+ jc.set("foo", "org.apache.commons.jexl2.Foo");
<br> Expression expr;
<br> Object value;
<br> expr = JEXL.createExpression("new(double, 1)");
<br>@@ -278,23 +278,23 @@
<br> public void testCalculations()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> /*
<br> * test to ensure new string cat works
<br> */
<br>- jc.setJexlVariable("stringy", "thingy" );
<br>+ jc.set("stringy", "thingy" );
<br> assertExpression(jc, "stringy + 2", "thingy2");
<br>
<br> /*
<br> * test new null coersion
<br> */
<br>- jc.setJexlVariable("imanull", null );
<br>+ jc.set("imanull", null );
<br> assertExpression(jc, "imanull + 2", new Integer(2));
<br> assertExpression(jc, "imanull + imanull", new Integer(0));
<br>
<br> /* test for bugzilla 31577 */
<br>- jc.setJexlVariable("n", new Integer(0));
<br>+ jc.set("n", new Integer(0));
<br> assertExpression(jc, "n != null && n != 0", Boolean.FALSE);
<br> }
<br>
<br>@@ -304,18 +304,18 @@
<br> public void testConditions()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", new Integer(2) );
<br>- jc.setJexlVariable("aFloat", new Float(1));
<br>- jc.setJexlVariable("aDouble", new Double(2));
<br>- jc.setJexlVariable("aChar", new Character('A'));
<br>- jc.setJexlVariable("aBool", Boolean.TRUE);
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("foo", new Integer(2) );
<br>+ jc.set("aFloat", new Float(1));
<br>+ jc.set("aDouble", new Double(2));
<br>+ jc.set("aChar", new Character('A'));
<br>+ jc.set("aBool", Boolean.TRUE);
<br> StringBuffer buffer = new StringBuffer("abc");
<br> List<Object> list = new ArrayList<Object>();
<br> List<Object> list2 = new LinkedList<Object>();
<br>- jc.setJexlVariable("aBuffer", buffer);
<br>- jc.setJexlVariable("aList", list);
<br>- jc.setJexlVariable("bList", list2);
<br>+ jc.set("aBuffer", buffer);
<br>+ jc.set("aList", list);
<br>+ jc.set("bList", list2);
<br>
<br> assertExpression(jc, "foo == 2", Boolean.TRUE);
<br> assertExpression(jc, "2 == 3", Boolean.FALSE);
<br>@@ -351,12 +351,12 @@
<br> public void testNotConditions()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Foo foo = new Foo();
<br>- jc.setJexlVariable("x", Boolean.TRUE );
<br>- jc.setJexlVariable("foo", foo );
<br>- jc.setJexlVariable("bar", "true" );
<br>+ jc.set("x", Boolean.TRUE );
<br>+ jc.set("foo", foo );
<br>+ jc.set("bar", "true" );
<br>
<br> assertExpression(jc, "!x", Boolean.FALSE);
<br> assertExpression(jc, "x", Boolean.TRUE);
<br>@@ -368,7 +368,7 @@
<br> assertExpression(jc, "foo.getCheeseList().size() == 3", Boolean.TRUE);
<br> assertExpression(jc, "foo.cheeseList.size() == 3", Boolean.TRUE);
<br>
<br>- jc.setJexlVariable("string", "");
<br>+ jc.set("string", "");
<br> assertExpression(jc, "not empty string", Boolean.FALSE);
<br> assertExpression(jc, "not(empty string)", Boolean.FALSE);
<br> assertExpression(jc, "not empty(string)", Boolean.FALSE);
<br>@@ -385,10 +385,10 @@
<br> public void testNotConditionsWithDots()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br>- jc.setJexlVariable("x.a", Boolean.TRUE );
<br>- jc.setJexlVariable("x.b", Boolean.FALSE );
<br>+ jc.set("x.a", Boolean.TRUE );
<br>+ jc.set("x.b", Boolean.FALSE );
<br>
<br> assertExpression(jc, "x.a", Boolean.TRUE);
<br> assertExpression(jc, "!x.a", Boolean.FALSE);
<br>@@ -401,8 +401,8 @@
<br> public void testComparisons()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", "the quick and lazy fox" );
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("foo", "the quick and lazy fox" );
<br>
<br> assertExpression(jc, "foo.indexOf('quick') > 0", Boolean.TRUE);
<br> assertExpression(jc, "foo.indexOf('bar') >= 0", Boolean.FALSE);
<br>@@ -415,8 +415,8 @@
<br> public void testNull()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("bar", new Integer(2) );
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("bar", new Integer(2) );
<br>
<br> assertExpression(jc, "empty foo", Boolean.TRUE);
<br> assertExpression(jc, "bar == null", Boolean.FALSE);
<br>@@ -431,7 +431,7 @@
<br> * test quoting in strings
<br> */
<br> public void testStringQuoting() throws Exception {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> assertExpression(jc, "'\"Hello\"'", "\"Hello\"");
<br> assertExpression(jc, "\"I'm testing\"", "I'm testing");
<br> }
<br>@@ -442,8 +442,8 @@
<br> public void testBlankStrings()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("bar", "" );
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("bar", "" );
<br>
<br> assertExpression(jc, "foo == ''", Boolean.FALSE);
<br> assertExpression(jc, "bar == ''", Boolean.TRUE);
<br>@@ -459,9 +459,9 @@
<br> public void testLogicExpressions()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", "abc" );
<br>- jc.setJexlVariable("bar", "def" );
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("foo", "abc" );
<br>+ jc.set("bar", "def" );
<br>
<br> assertExpression(jc, "foo == 'abc' || bar == 'abc'", Boolean.TRUE);
<br> assertExpression(jc, "foo == 'abc' or bar == 'abc'", Boolean.TRUE);
<br>@@ -481,8 +481,8 @@
<br> public void testVariableNames()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo_bar", "123" );
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("foo_bar", "123" );
<br>
<br> assertExpression(jc, "foo_bar", "123");
<br> }
<br>@@ -496,8 +496,8 @@
<br> Map<String, String> foo = new HashMap<String, String>();
<br> foo.put( "bar", "123" );
<br>
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", foo );
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("foo", foo );
<br>
<br> assertExpression(jc, "foo.bar", "123");
<br> }
<br>@@ -508,8 +508,8 @@
<br> public void testStringLiterals()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", "bar" );
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("foo", "bar" );
<br>
<br> assertExpression(jc, "foo == \"bar\"", Boolean.TRUE);
<br> assertExpression(jc, "foo == 'bar'", Boolean.TRUE);
<br>@@ -527,8 +527,8 @@
<br> assertEquals(4, foo.square(2));
<br> assertEquals(4, foo.square(-2));
<br>
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", foo );
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("foo", foo );
<br>
<br> assertExpression(jc, "foo.count", new Integer(5));
<br> assertExpression(jc, "foo.square(2)", new Integer(4));
<br>@@ -541,9 +541,9 @@
<br> public void testNegativeIntComparison()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Foo foo = new Foo();
<br>- jc.setJexlVariable("foo", foo );
<br>+ jc.set("foo", foo );
<br>
<br> assertExpression(jc, "foo.count != -1", Boolean.TRUE);
<br> assertExpression(jc, "foo.count == 5", Boolean.TRUE);
<br>@@ -556,9 +556,9 @@
<br> public void testCharAtBug()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br>- jc.setJexlVariable("foo", "abcdef");
<br>+ jc.set("foo", "abcdef");
<br>
<br> assertExpression(jc, "foo.substring(2,4)", "cd");
<br> assertExpression(jc, "foo.charAt(2)", new Character('c'));
<br>@@ -568,20 +568,20 @@
<br>
<br> public void testEmptyDottedVariableName() throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br>- jc.setJexlVariable( "this.is.a.test", "");
<br>+ jc.set( "this.is.a.test", "");
<br>
<br> assertExpression(jc, "empty(this.is.a.test)", Boolean.TRUE);
<br> }
<br>
<br> public void testEmptySubListOfMap() throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Map<String, ArrayList<?>> m = new HashMap<String, ArrayList<?>>();
<br> m.put("aList", new ArrayList<Object>());
<br>
<br>- jc.setJexlVariable( "aMap", m );
<br>+ jc.set( "aMap", m );
<br>
<br> assertExpression( jc, "empty( aMap.aList )", Boolean.TRUE );
<br> }
<br>@@ -589,7 +589,7 @@
<br> public void testCoercionWithComparisionOperators()
<br> throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> assertExpression(jc, "'2' > 1", Boolean.TRUE);
<br> assertExpression(jc, "'2' >= 1", Boolean.TRUE);
<br>@@ -614,16 +614,16 @@
<br> {
<br> // handle false for the left arg of 'and'
<br> Foo tester = new Foo();
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("first", Boolean.FALSE);
<br>- jc.setJexlVariable("foo", tester);
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("first", Boolean.FALSE);
<br>+ jc.set("foo", tester);
<br> Expression expr = JEXL.createExpression("first and foo.trueAndModify");
<br> expr.evaluate(jc);
<br> assertTrue("Short circuit failure: rhs evaluated when lhs FALSE", !tester.getModified());
<br> // handle true for the left arg of 'and'
<br> tester = new Foo();
<br>- jc.setJexlVariable("first", Boolean.TRUE);
<br>- jc.setJexlVariable("foo", tester);
<br>+ jc.set("first", Boolean.TRUE);
<br>+ jc.set("foo", tester);
<br> expr.evaluate(jc);
<br> assertTrue("Short circuit failure: rhs not evaluated when lhs TRUE", tester.getModified());
<br> }
<br>@@ -636,16 +636,16 @@
<br> {
<br> // handle false for the left arg of 'or'
<br> Foo tester = new Foo();
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("first", Boolean.FALSE);
<br>- jc.setJexlVariable("foo", tester);
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("first", Boolean.FALSE);
<br>+ jc.set("foo", tester);
<br> Expression expr = JEXL.createExpression("first or foo.trueAndModify");
<br> expr.evaluate(jc);
<br> assertTrue("Short circuit failure: rhs not evaluated when lhs FALSE", tester.getModified());
<br> // handle true for the left arg of 'or'
<br> tester = new Foo();
<br>- jc.setJexlVariable("first", Boolean.TRUE);
<br>- jc.setJexlVariable("foo", tester);
<br>+ jc.set("first", Boolean.TRUE);
<br>+ jc.set("foo", tester);
<br> expr.evaluate(jc);
<br> assertTrue("Short circuit failure: rhs evaluated when lhs TRUE", !tester.getModified());
<br> }
<br>@@ -656,9 +656,9 @@
<br> */
<br> public void testStringConcatenation() throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("first", "Hello");
<br>- jc.setJexlVariable("second", "World");
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("first", "Hello");
<br>+ jc.set("second", "World");
<br> assertExpression(jc, "first + ' ' + second", "Hello World");
<br> }
<br>
<br>@@ -676,7 +676,7 @@
<br> {
<br> try
<br> {
<br>- assertExpression(new JexlContext.Mapped(), "empty()", null);
<br>+ assertExpression(new MapContext(), "empty()", null);
<br> fail("Bad expression didn't throw ParseException");
<br> }
<br> catch (JexlException pe)
<br>@@ -691,7 +691,7 @@
<br> */
<br> public void testComment() throws Exception
<br> {
<br>- assertExpression(new JexlContext.Mapped(), "## double or nothing\n 1 + 1", Integer.valueOf("2"));
<br>+ assertExpression(new MapContext(), "## double or nothing\n 1 + 1", Integer.valueOf("2"));
<br> }
<br>
<br> /**
<br>@@ -700,17 +700,17 @@
<br> */
<br> public void testAssignment() throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("aString", "Hello");
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("aString", "Hello");
<br> Foo foo = new Foo();
<br>- jc.setJexlVariable("foo", foo);
<br>+ jc.set("foo", foo);
<br> Parser parser = new Parser(new StringReader(";"));
<br> parser.parse(new StringReader("aString = 'World';"), null);
<br>
<br> assertExpression(jc, "hello = 'world'", "world");
<br>- assertEquals("hello variable not changed", "world", jc.getJexlVariable("hello"));
<br>+ assertEquals("hello variable not changed", "world", jc.get("hello"));
<br> assertExpression(jc, "result = 1 + 1", new Integer(2));
<br>- assertEquals("result variable not changed", new Integer(2), jc.getJexlVariable("result"));
<br>+ assertEquals("result variable not changed", new Integer(2), jc.get("result"));
<br> // todo: make sure properties can be assigned to, fall back to flat var if no property
<br> // assertExpression(jc, "foo.property1 = '99'", "99");
<br> // assertEquals("property not set", "99", foo.getProperty1());
<br>@@ -718,9 +718,9 @@
<br>
<br> public void testAntPropertiesWithMethods() throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> String value = "Stinky Cheese";
<br>- jc.setJexlVariable("maven.bob.food", value);
<br>+ jc.set("maven.bob.food", value);
<br> assertExpression(jc, "maven.bob.food.length()", new Integer(value.length()));
<br> assertExpression(jc, "empty(maven.bob.food)", Boolean.FALSE);
<br> assertExpression(jc, "size(maven.bob.food)", new Integer(value.length()));
<br>@@ -728,13 +728,13 @@
<br>
<br> // DG: Note the following ant properties don't work
<br> // String version = "1.0.3";
<br>-// jc.setJexlVariable("commons-logging", version);
<br>+// jc.set("commons-logging", version);
<br> // assertExpression(jc, "commons-logging", version);
<br> }
<br>
<br> public void testUnicodeSupport() throws Exception
<br> {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> assertExpression(jc, "myvar == 'Użytkownik'", Boolean.FALSE);
<br> assertExpression(jc, "'c:\\some\\windows\\path'", "c:\\some\\windows\\path");
<br> assertExpression(jc, "'foo\\u0020bar'", "foo\u0020bar");
<br>@@ -770,8 +770,8 @@
<br> @SuppressWarnings("boxing")
<br> public void testDuck() throws Exception {
<br> JexlEngine jexl = JEXL;
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("duck", new Duck());
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("duck", new Duck());
<br> Expression expr;
<br> Object result;
<br> expr = jexl.createExpression("duck.zero");
<br>@@ -797,8 +797,8 @@
<br> public void testArray() throws Exception {
<br> int[] array = { 100, 101 , 102 };
<br> JexlEngine jexl = JEXL;
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("array", array);
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("array", array);
<br> Expression expr;
<br> Object result;
<br> expr = jexl.createExpression("array.1");
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java Mon Nov 30 19:28:40 2009
<br>@@ -30,7 +30,7 @@
<br>
<br> public void testLiteralWithStrings() throws Exception {
<br> Expression e = JEXL.createExpression( "{ 'foo' : 'bar' }" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> assertEquals( Collections.singletonMap( "foo", "bar" ), o );
<br>@@ -38,7 +38,7 @@
<br>
<br> public void testLiteralWithMultipleEntries() throws Exception {
<br> Expression e = JEXL.createExpression( "{ 'foo' : 'bar', 'eat' : 'food' }" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Map<String, String> expected = new HashMap<String, String>();
<br> expected.put( "foo", "bar" );
<br>@@ -50,7 +50,7 @@
<br>
<br> public void testLiteralWithNumbers() throws Exception {
<br> Expression e = JEXL.createExpression( "{ 5 : 10 }" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> assertEquals( Collections.singletonMap( new Integer( 5 ), new Integer( 10 ) ), o );
<br>@@ -66,7 +66,7 @@
<br> o = e.evaluate(jc);
<br> assertEquals(new Integer(40), o);
<br>
<br>- jc.setJexlVariable("i", Integer.valueOf(5));
<br>+ jc.set("i", Integer.valueOf(5));
<br> e = JEXL.createExpression("m[i]");
<br> o = e.evaluate(jc);
<br> assertEquals("fifty", o);
<br>@@ -85,12 +85,12 @@
<br> o = e.evaluate(jc);
<br> assertEquals("SEVEN", o);
<br>
<br>- jc.setJexlVariable("k", Integer.valueOf(7));
<br>+ jc.set("k", Integer.valueOf(7));
<br> e = JEXL.createExpression("m[k]");
<br> o = e.evaluate(jc);
<br> assertEquals("SEVEN", o);
<br>
<br>- jc.setJexlVariable("k", "7");
<br>+ jc.set("k", "7");
<br> e = JEXL.createExpression("m[k]");
<br> o = e.evaluate(jc);
<br> assertEquals("seven", o);
<br>@@ -98,7 +98,7 @@
<br>
<br> public void testSizeOfSimpleMapLiteral() throws Exception {
<br> Expression e = JEXL.createExpression( "size({ 'foo' : 'bar' })" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> assertEquals( new Integer( 1 ), o );
<br>@@ -106,7 +106,7 @@
<br>
<br> public void testCallingMethodsOnNewMapLiteral() throws Exception {
<br> Expression e = JEXL.createExpression( "size({ 'foo' : 'bar' }.values())" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> assertEquals( new Integer( 1 ), o );
<br>@@ -114,7 +114,7 @@
<br>
<br> public void testNotEmptySimpleMapLiteral() throws Exception {
<br> Expression e = JEXL.createExpression( "empty({ 'foo' : 'bar' })" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> assertFalse( ( (Boolean) o ).booleanValue() );
<br>@@ -122,11 +122,11 @@
<br>
<br> public void testMapMapLiteral() throws Exception {
<br> Expression e = JEXL.createExpression( "{'foo' : { 'inner' : 'bar' }}" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Object o = e.evaluate( jc );
<br> assertNotNull(o);
<br>
<br>- jc.setJexlVariable("outer", o);
<br>+ jc.set("outer", o);
<br> e = JEXL.createExpression("outer.foo.inner");
<br> o = e.evaluate( jc );
<br> assertEquals( "bar", o );
<br>@@ -134,11 +134,11 @@
<br>
<br> public void testMapArrayLiteral() throws Exception {
<br> Expression e = JEXL.createExpression( "{'foo' : [ 'inner' , 'bar' ]}" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Object o = e.evaluate( jc );
<br> assertNotNull(o);
<br>
<br>- jc.setJexlVariable("outer", o);
<br>+ jc.set("outer", o);
<br> e = JEXL.createExpression("outer.foo.1");
<br> o = e.evaluate( jc );
<br> assertEquals( "bar", o );
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java Mon Nov 30 19:28:40 2009
<br>@@ -132,7 +132,7 @@
<br> funcs.put("math", new MyMath());
<br> JEXL.setFunctions(funcs);
<br>
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Expression e = JEXL.createExpression("ten()");
<br> Object o = e.evaluate(jc);
<br>@@ -146,7 +146,7 @@
<br> o = e.evaluate(jc);
<br> assertEquals("Result is not 20", new Integer(20), o);
<br>
<br>- jc.setJexlVariable("pi", Math.PI);
<br>+ jc.set("pi", Math.PI);
<br> e = JEXL.createExpression("math:cos(pi)");
<br> o = e.evaluate(jc);
<br> assertEquals(Double.valueOf(-1),o);
<br>@@ -159,27 +159,27 @@
<br> JEXL.setFunctions(funcs);
<br>
<br> Expression e = JEXL.createExpression("func:ten()");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is not 10", new Integer(10), o);
<br>
<br> e = JEXL.createExpression("func:plus10(10)");
<br>- jc = new JexlContext.Mapped();
<br>+ jc = new MapContext();
<br> o = e.evaluate(jc);
<br> assertEquals("Result is not 20", new Integer(20), o);
<br>
<br> e = JEXL.createExpression("func:plus10(func:ten())");
<br>- jc = new JexlContext.Mapped();
<br>+ jc = new MapContext();
<br> o = e.evaluate(jc);
<br> assertEquals("Result is not 20", new Integer(20), o);
<br>
<br> e = JEXL.createExpression("FUNC:PLUS20(10)");
<br>- jc = new JexlContext.Mapped();
<br>+ jc = new MapContext();
<br> o = e.evaluate(jc);
<br> assertEquals("Result is not 30", new Integer(30), o);
<br>
<br> e = JEXL.createExpression("FUNC:PLUS20(FUNC:TWENTY())");
<br>- jc = new JexlContext.Mapped();
<br>+ jc = new MapContext();
<br> o = e.evaluate(jc);
<br> assertEquals("Result is not 40", new Integer(40), o);
<br> }
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java Mon Nov 30 19:28:40 2009
<br>@@ -60,8 +60,8 @@
<br> private void simpleScript(boolean jexl) throws Exception {
<br> String code = "while (x < 10) x = x + 1;";
<br> Script s = jexl? JEXL.createScript(code) : ScriptFactory.createScript(code);
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("x", new Integer(1));
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("x", new Integer(1));
<br>
<br> Object o = s.execute(jc);
<br> assertEquals("Result is wrong", new Integer(10), o);
<br>@@ -77,8 +77,8 @@
<br> private void scriptFromFile(boolean jexl) throws Exception {
<br> File testScript = new File(TEST1);
<br> Script s = jexl? JEXL.createScript(testScript) : ScriptFactory.createScript(testScript);
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("out", System.out);
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("out", System.out);
<br> Object result = s.execute(jc);
<br> assertNotNull("No result", result);
<br> assertEquals("Wrong result", new Integer(7), result);
<br>@@ -93,8 +93,8 @@
<br> private void scriptFromURL(boolean jexl) throws Exception {
<br> URL testUrl = new File("src/test/scripts/test1.jexl").toURI().toURL();
<br> Script s = jexl? JEXL.createScript(testUrl) : ScriptFactory.createScript(testUrl);
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("out", System.out);
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("out", System.out);
<br> Object result = s.execute(jc);
<br> assertNotNull("No result", result);
<br> assertEquals("Wrong result", new Integer(7), result);
<br>@@ -112,8 +112,8 @@
<br> Script s = jexl? JEXL.createScript(jexlCode) : ScriptFactory.createScript(jexlCode);
<br>
<br> Tester resultatJexl = new Tester();
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("resultat", resultatJexl);
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("resultat", resultatJexl);
<br>
<br> resultatJexl.setCode("");
<br> e.evaluate(jc);
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java Mon Nov 30 19:28:40 2009
<br>@@ -39,7 +39,7 @@
<br> // ensure jul logging is only error
<br> java.util.logging.Logger.getLogger(JexlEngine.class.getName()).setLevel(java.util.logging.Level.SEVERE);
<br> vars = new HashMap<String,Object>();
<br>- context = new JexlContext.Mapped(vars);
<br>+ context = new MapContext(vars);
<br> }
<br>
<br> @Override
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java Mon Nov 30 19:28:40 2009
<br>@@ -30,7 +30,7 @@
<br>
<br> public void testSimpleWhileFalse() throws Exception {
<br> Expression e = JEXL.createExpression("while (false) ;");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate(jc);
<br> assertNull("Result is not null", o);
<br>@@ -38,8 +38,8 @@
<br>
<br> public void testWhileExecutesExpressionWhenLooping() throws Exception {
<br> Expression e = JEXL.createExpression("while (x < 10) x = x + 1;");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("x", new Integer(1));
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("x", new Integer(1));
<br>
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is wrong", new Integer(10), o);
<br>@@ -47,13 +47,13 @@
<br>
<br> public void testWhileWithBlock() throws Exception {
<br> Expression e = JEXL.createExpression("while (x < 10) { x = x + 1; y = y * 2; }");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("x", new Integer(1));
<br>- jc.setJexlVariable("y", new Integer(1));
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("x", new Integer(1));
<br>+ jc.set("y", new Integer(1));
<br>
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is wrong", new Integer(512), o);
<br>- assertEquals("x is wrong", new Integer(10), jc.getJexlVariable("x"));
<br>- assertEquals("y is wrong", new Integer(512), jc.getJexlVariable("y"));
<br>+ assertEquals("x is wrong", new Integer(10), jc.get("x"));
<br>+ assertEquals("y is wrong", new Integer(512), jc.get("y"));
<br> }
<br> }
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java Mon Nov 30 19:28:40 2009
<br>@@ -42,13 +42,13 @@
<br> /*
<br> * Second make a jexlContext and put stuff in it
<br> */
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> List<Object> l = new ArrayList<Object>();
<br> l.add("Hello from location 0");
<br> Integer two = new Integer(2);
<br> l.add(two);
<br>- jc.setJexlVariable("array", l);
<br>+ jc.set("array", l);
<br>
<br> Expression e = jexl.createExpression("array[1]");
<br> Object o = e.evaluate(jc);
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java Mon Nov 30 19:28:40 2009
<br>@@ -40,7 +40,7 @@
<br> /*
<br> * Second make a jexlContext and put stuff in it
<br> */
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> /**
<br> * The Java equivalents of foo and number for comparison and checking
<br>@@ -48,8 +48,8 @@
<br> Foo foo = new Foo();
<br> Integer number = new Integer(10);
<br>
<br>- jc.setJexlVariable("foo", foo);
<br>- jc.setJexlVariable("number", number);
<br>+ jc.set("foo", foo);
<br>+ jc.set("number", number);
<br>
<br> /*
<br> * access a method w/o args
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java Mon Nov 30 19:28:40 2009
<br>@@ -24,6 +24,7 @@
<br>
<br> import org.apache.commons.jexl2.Expression;
<br> import org.apache.commons.jexl2.JexlContext;
<br>+import org.apache.commons.jexl2.MapContext;
<br> import org.apache.commons.jexl2.JexlEngine;
<br>
<br> /**
<br>@@ -39,7 +40,7 @@
<br> /** variables used during asserts. */
<br> private final Map<String, Object> variables = new HashMap<String, Object>();
<br> /** context to use during asserts. */
<br>- private final JexlContext context = new JexlContext.Mapped(variables);
<br>+ private final JexlContext context = new MapContext(variables);
<br>
<br> /** Jexl engine to use during Asserts. */
<br> private final JexlEngine engine;
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java Mon Nov 30 19:28:40 2009
<br>@@ -22,7 +22,10 @@
<br> import java.util.Map;
<br>
<br>
<br>+import org.apache.commons.jexl2.JexlEngine;
<br> import org.apache.commons.jexl2.JexlTestCase;
<br>+import org.apache.commons.jexl2.introspection.Uberspect;
<br>+
<br> import org.apache.commons.jexl2.util.Introspector;
<br> import org.apache.commons.jexl2.util.AbstractExecutor;
<br> import org.apache.commons.jexl2.util.PropertyGetExecutor;
<br>@@ -97,7 +100,7 @@
<br>
<br>
<br> public void testBeanIntrospection() throws Exception {
<br>- Uberspect uber = Introspector.getUberspect();
<br>+ Uberspect uber = JexlEngine.getUberspect(null);
<br> Introspector intro = (Introspector) uber;
<br> Bean bean = new Bean("JEXL", "LXEJ");
<br>
<br>@@ -126,7 +129,7 @@
<br> }
<br>
<br> public void testDuckIntrospection() throws Exception {
<br>- Uberspect uber = Introspector.getUberspect();
<br>+ Uberspect uber = JexlEngine.getUberspect(null);
<br> Introspector intro = (Introspector) uber;
<br> Duck duck = new Duck("JEXL", "LXEJ");
<br>
<br>@@ -154,7 +157,7 @@
<br> }
<br>
<br> public void testListIntrospection() throws Exception {
<br>- Uberspect uber = Introspector.getUberspect();
<br>+ Uberspect uber = JexlEngine.getUberspect(null);
<br> Introspector intro = (Introspector) uber;
<br> List<Object> list = new ArrayList<Object>();
<br> list.add("LIST");
<br>@@ -185,7 +188,7 @@
<br> }
<br>
<br> public void testMapIntrospection() throws Exception {
<br>- Uberspect uber = Introspector.getUberspect();
<br>+ Uberspect uber = JexlEngine.getUberspect(null);
<br> Introspector intro = (Introspector) uber;
<br> Map<String, Object> map = new HashMap<String, Object>();
<br> map.put("value", "MAP");
<br><br>Modified: commons/proper/jexl/trunk/xdocs/index.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/xdocs/index.xml?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/xdocs/index.xml?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/xdocs/index.xml (original)
<br>+++ commons/proper/jexl/trunk/xdocs/index.xml Mon Nov 30 19:28:40 2009
<br>@@ -107,7 +107,7 @@
<br>
<br> // Create a context and add data
<br> JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", new Foo() );
<br>+ jc.set("foo", new Foo() );
<br>
<br> // Now evaluate the expression, getting the result
<br> Object o = e.evaluate(jc);
<br><br>Modified: commons/proper/jexl/trunk/xdocs/reference/examples.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/xdocs/reference/examples.xml?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/xdocs/reference/examples.xml?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/xdocs/reference/examples.xml (original)
<br>+++ commons/proper/jexl/trunk/xdocs/reference/examples.xml Mon Nov 30 19:28:40 2009
<br>@@ -79,10 +79,10 @@
<br>
<br> // populate the context
<br> JexlContext context = new JexlContext.Mapped();
<br>- context.setJexlVariable("G1", businessObject.getTotalSales());
<br>- context.setJexlVariable("G2", taxManager.getTaxCredit(businessObject.getYear()));
<br>- context.setJexlVariable("G3", businessObject.getIntercompanyPayments());
<br>- context.setJexlVariable("G4", -taxManager.getAllowances());
<br>+ context.set("G1", businessObject.getTotalSales());
<br>+ context.set("G2", taxManager.getTaxCredit(businessObject.getYear()));
<br>+ context.set("G3", businessObject.getIntercompanyPayments());
<br>+ context.set("G4", -taxManager.getAllowances());
<br> // ...
<br>
<br> // work it out
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26580478
svn commit: r885553 [1/2] - in /commons/proper/jexl/trunk: src/main/java/org/apache/commons/jexl2/ src/main/java/org/apache/commons/jexl2/introspection/ src/main/java/org/apache/commons/jexl2/parser/ src/main/java/org/apache/commons/jexl2/scripting/ sr...
2009-11-30T11:28:41Z
2009-11-30T11:28:41Z
henrib-2
Author: henrib
<br>Date: Mon Nov 30 19:28:40 2009
<br>New Revision: 885553
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885553&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885553&view=rev</a><br>Log:
<br>JEXL-92: follow up on Rahul's comments (JexlContext exposes set/get/has);
<br>moved JexlContext.Mapped as MapContext;
<br>moved Uberspect & related classes to oac.jexl2.introspection;
<br>moved DebugInfo & JexlInfo to oac.jexl2
<br><br>Added:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/DebugInfo.java
<br> - copied, changed from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Info.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlInfo.java
<br> - copied, changed from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/DebugInfo.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/MapContext.java (with props)
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java
<br> - copied, changed from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlMethod.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java
<br> - copied, changed from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertyGet.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java
<br> - copied, changed from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertySet.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Uberspect.java
<br> - copied, changed from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Uberspect.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java
<br> - copied, changed from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/package.html (with props)
<br>Removed:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/DebugInfo.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Info.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Introspector.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlMethod.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertyGet.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertySet.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Uberspect.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java
<br>Modified:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlNode.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/AbstractExecutor.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/IntrospectorBase.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ClassCreatorTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ForEachTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IfTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/IssuesTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/Jexl.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/JexlTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/DiscoveryTest.java
<br> commons/proper/jexl/trunk/xdocs/index.xml
<br> commons/proper/jexl/trunk/xdocs/reference/examples.xml
<br><br>Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/DebugInfo.java (from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Info.java)
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/DebugInfo.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/DebugInfo.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Info.java&r1=884622&r2=885553&rev=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/DebugInfo.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/DebugInfo.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Info.java&r1=884622&r2=885553&rev=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Info.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/DebugInfo.java Mon Nov 30 19:28:40 2009
<br>@@ -14,19 +14,15 @@
<br> * See the License for the specific language governing permissions and
<br> * limitations under the License.
<br> */
<br>-package org.apache.commons.jexl2.util.introspection;
<br>+package org.apache.commons.jexl2;
<br>+
<br>
<br> /**
<br>- * Little class to carry in info such as a file or template name, line and column for
<br>+ * Little class to carry in info such as a url/file name, line and column for
<br> * information error reporting from the uberspector implementations.
<br>- * <p>
<br>- * Originally taken from Velocity for self-sufficiency.
<br>- * </p>
<br>- * @since 1.0
<br>- * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26580478&i=0" target="_top" rel="nofollow">geirm@...</a>">Geir Magnusson Jr.</a>
<br> * @version $Id$
<br> */
<br>-public class Info implements DebugInfo {
<br>+public class DebugInfo implements JexlInfo {
<br> /** line number. */
<br> private final int line;
<br> /** column number. */
<br>@@ -39,7 +35,7 @@
<br> * @param l line number
<br> * @param c column
<br> */
<br>- public Info(String tn, int l, int c) {
<br>+ public DebugInfo(String tn, int l, int c) {
<br> name = tn;
<br> line = l;
<br> column = c;
<br>@@ -77,16 +73,6 @@
<br> }
<br>
<br> /**
<br>- * Gets the template name.
<br>- * @return template name
<br>- * @deprecated Use {@link #getName()} instead
<br>- */
<br>- @Deprecated
<br>- public String getTemplateName() {
<br>- return name;
<br>- }
<br>-
<br>- /**
<br> * Gets the line number.
<br> * @return line number.
<br> */
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Interpreter.java Mon Nov 30 19:28:40 2009
<br>@@ -79,10 +79,10 @@
<br> import org.apache.commons.jexl2.parser.ParserVisitor;
<br>
<br> import org.apache.commons.jexl2.util.AbstractExecutor;
<br>-import org.apache.commons.jexl2.util.introspection.Uberspect;
<br>-import org.apache.commons.jexl2.util.introspection.JexlMethod;
<br>-import org.apache.commons.jexl2.util.introspection.JexlPropertyGet;
<br>-import org.apache.commons.jexl2.util.introspection.JexlPropertySet;
<br>+import org.apache.commons.jexl2.introspection.Uberspect;
<br>+import org.apache.commons.jexl2.introspection.JexlMethod;
<br>+import org.apache.commons.jexl2.introspection.JexlPropertyGet;
<br>+import org.apache.commons.jexl2.introspection.JexlPropertySet;
<br>
<br> /**
<br> * An interpreter of JEXL syntax.
<br>@@ -360,7 +360,7 @@
<br> variableName.append('.');
<br> variableName.append(left.jjtGetChild(v).image);
<br> }
<br>- object = context.getJexlVariable(variableName.toString());
<br>+ object = context.get(variableName.toString());
<br> // disallow mixing ant & bean with same root; avoid ambiguity
<br> if (object != null) {
<br> isVariable = false;
<br>@@ -382,7 +382,7 @@
<br> variableName.append(property);
<br> property = variableName.toString();
<br> }
<br>- context.setJexlVariable(String.valueOf(property), right);
<br>+ context.set(String.valueOf(property), right);
<br> return right;
<br> }
<br> } else if (propertyNode instanceof ASTIntegerLiteral) {
<br>@@ -396,7 +396,7 @@
<br> variableName.append(property);
<br> property = variableName.toString();
<br> }
<br>- context.setJexlVariable(String.valueOf(property), right);
<br>+ context.set(String.valueOf(property), right);
<br> return right;
<br> }
<br> } else if (propertyNode instanceof ASTArrayAccess) {
<br>@@ -581,12 +581,14 @@
<br> // get an iterator for the collection/array etc via the
<br> // introspector.
<br> Iterator<?> itemsIterator = getUberspect().getIterator(iterableValue, node);
<br>- while (itemsIterator.hasNext()) {
<br>- // set loopVariable to value of iterator
<br>- Object value = itemsIterator.next();
<br>- context.setJexlVariable(loopVariable.image, value);
<br>- // execute statement
<br>- result = statement.jjtAccept(this, data);
<br>+ if (itemsIterator != null) {
<br>+ while (itemsIterator.hasNext()) {
<br>+ // set loopVariable to value of iterator
<br>+ Object value = itemsIterator.next();
<br>+ context.set(loopVariable.image, value);
<br>+ // execute statement
<br>+ result = statement.jjtAccept(this, data);
<br>+ }
<br> }
<br> }
<br> return result;
<br>@@ -626,10 +628,10 @@
<br> return registers[3];
<br> }
<br> }
<br>- Object value = context.getJexlVariable(name);
<br>+ Object value = context.get(name);
<br> if (value == null
<br> && !(node.jjtGetParent() instanceof ASTReference)
<br>- && JexlEngine.isVariableUndefined(context, name)) {
<br>+ && !context.has(name)) {
<br> JexlException xjexl = new JexlException(node, "undefined variable " + name);
<br> return unknownVariable(xjexl);
<br> }
<br>@@ -991,13 +993,13 @@
<br> variableName.append('.');
<br> variableName.append(node.jjtGetChild(v).image);
<br> }
<br>- result = context.getJexlVariable(variableName.toString());
<br>+ result = context.get(variableName.toString());
<br> }
<br> }
<br> if (result == null) {
<br> if (isVariable
<br> && !(node.jjtGetParent() instanceof ASTTernaryNode)
<br>- && JexlEngine.isVariableUndefined(context, variableName.toString())) {
<br>+ && !context.has(variableName.toString())) {
<br> JexlException xjexl = new JexlException(node, "undefined variable " + variableName.toString());
<br> return unknownVariable(xjexl);
<br> }
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java Mon Nov 30 19:28:40 2009
<br>@@ -16,9 +16,6 @@
<br> */
<br> package org.apache.commons.jexl2;
<br>
<br>-import java.util.HashMap;
<br>-import java.util.Map;
<br>-
<br> /**
<br> * Manages variables which can be referenced in a JEXL expression.
<br> *
<br>@@ -31,69 +28,21 @@
<br> * @param name the variable's name
<br> * @return the value
<br> */
<br>- Object getJexlVariable(String name);
<br>+ Object get(String name);
<br>
<br> /**
<br> * Sets the value of a variable.
<br> * @param name the variable's name
<br> * @param value the variable's value
<br> */
<br>- void setJexlVariable(String name, Object value);
<br>+ void set(String name, Object value);
<br>
<br> /**
<br>- * A context that differentiates null valued variables and undefined ones.
<br>- * <p>A non-nullable context does not allow differentiating a variable whose
<br>- * value is null and an undefined one; thus the Nullable name for this kind of context.</p>
<br>- */
<br>- public interface Nullable extends JexlContext {
<br>- /**
<br>- * Checks whether a variable is defined in this context.
<br>- * <p>A variable may be defined with a null value; this method checks whether the
<br>- * value is null or if the variable is undefined.</p>
<br>- * @param name the variable's name
<br>- * @return true if it exists, false otherwise
<br>- */
<br>- boolean definesJexlVariable(String name);
<br>- }
<br>-
<br>- /**
<br>- * Wraps a map in a context.
<br>- * <p>Each entry in the map is considered a variable name, value pair.</p>
<br>+ * Checks whether a variable is defined in this context.
<br>+ * <p>A variable may be defined with a null value; this method checks whether the
<br>+ * value is null or if the variable is undefined.</p>
<br>+ * @param name the variable's name
<br>+ * @return true if it exists, false otherwise
<br> */
<br>- public static class Mapped implements Nullable {
<br>- /**
<br>- * The wrapped variable map.
<br>- */
<br>- protected final Map<Object,Object> map;
<br>- /**
<br>- * Creates an instance using an HashMap as the underlying variable storage.
<br>- */
<br>- public Mapped() {
<br>- this(null);
<br>- }
<br>- /**
<br>- * Creates an instance using a provided map as the underlying variable storage.
<br>- * @param vars the variables map
<br>- */
<br>- @SuppressWarnings("unchecked") // OK to cast Map<?,?> to Map<Object,Object>
<br>- public Mapped(Map<?, ?> vars) {
<br>- map = (Map<Object,Object>) (vars == null? new HashMap<String,Object>() : vars);
<br>- }
<br>-
<br>- /** {@inheritDoc} */
<br>- public boolean definesJexlVariable(String name) {
<br>- return map.containsKey(name);
<br>- }
<br>-
<br>- /** {@inheritDoc} */
<br>- public Object getJexlVariable(String name) {
<br>- return map.get(name);
<br>- }
<br>-
<br>- /** {@inheritDoc} */
<br>- public void setJexlVariable(String name, Object value) {
<br>- map.put(name, value);
<br>- }
<br>- }
<br>-
<br>+ boolean has(String name);
<br> }
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java Mon Nov 30 19:28:40 2009
<br>@@ -39,10 +39,10 @@
<br> import org.apache.commons.jexl2.parser.JexlNode;
<br> import org.apache.commons.jexl2.parser.TokenMgrError;
<br> import org.apache.commons.jexl2.parser.ASTJexlScript;
<br>-import org.apache.commons.jexl2.util.Introspector;
<br>-import org.apache.commons.jexl2.util.introspection.Uberspect;
<br>-import org.apache.commons.jexl2.util.introspection.Info;
<br>-import org.apache.commons.jexl2.util.introspection.JexlMethod;
<br>+
<br>+import org.apache.commons.jexl2.introspection.Uberspect;
<br>+import org.apache.commons.jexl2.introspection.UberspectImpl;
<br>+import org.apache.commons.jexl2.introspection.JexlMethod;
<br>
<br> /**
<br> * <p>
<br>@@ -88,39 +88,39 @@
<br> * @since 2.0
<br> */
<br> public class JexlEngine {
<br>-
<br>- /**
<br>- * Checks whether a variable is defined in a context.
<br>- * @param context the context
<br>- * @param name the variable's name
<br>- * @return true if the variable is defined, false otherwise
<br>- */
<br>- protected static boolean isVariableUndefined(JexlContext context, String name) {
<br>- if (context instanceof JexlContext.Nullable) {
<br>- return !((JexlContext.Nullable) context).definesJexlVariable(name);
<br>- }
<br>- return context.getJexlVariable(name) == null;
<br>- }
<br>-
<br> /**
<br> * An empty/static/non-mutable JexlContext used instead of null context.
<br> */
<br>- protected static final JexlContext EMPTY_CONTEXT = new JexlContext.Nullable() {
<br>+ protected static final JexlContext EMPTY_CONTEXT = new JexlContext() {
<br> /** {@inheritDoc} */
<br>- public Object getJexlVariable(String name) {
<br>+ public Object get(String name) {
<br> return null;
<br> }
<br> /** {@inheritDoc} */
<br>- public boolean definesJexlVariable(String name) {
<br>+ public boolean has(String name) {
<br> return false;
<br> }
<br> /** {@inheritDoc} */
<br>- public void setJexlVariable(String name, Object value) {
<br>+ public void set(String name, Object value) {
<br> throw new UnsupportedOperationException("Not supported in void context.");
<br> }
<br> };
<br>
<br> /**
<br>+ * Gets the default instance of Uberspect.
<br>+ * <p>This is lazily initialized to avoid building a default instance if there
<br>+ * is no use for it. The main reason for not using the default Uberspect instance is to
<br>+ * be able to use a (low level) introspector created with a given logger
<br>+ * instead of the default one.</p>
<br>+ * <p>Implemented as on demand holder idiom.</p>
<br>+ * @return Uberspect the default uberspector instance.
<br>+ */
<br>+ private static class UberspectHolder {
<br>+ /** The default uberspector that handles all introspection patterns. */
<br>+ private static final Uberspect UBERSPECT = new UberspectImpl(LogFactory.getLog(JexlEngine.class));
<br>+ }
<br>+
<br>+ /**
<br> * The Uberspect instance.
<br> */
<br> protected final Uberspect uberspect;
<br>@@ -176,20 +176,42 @@
<br> * @param log the logger for various messages
<br> */
<br> public JexlEngine(Uberspect anUberspect, JexlArithmetic anArithmetic, Map<String, Object> theFunctions, Log log) {
<br>+ this.uberspect = anUberspect == null ? getUberspect(log) : anUberspect;
<br> if (log == null) {
<br> log = LogFactory.getLog(JexlEngine.class);
<br> }
<br>- if (log == null) {
<br>- throw new NullPointerException("logger can not be null");
<br>- }
<br> this.logger = log;
<br>- this.uberspect = anUberspect == null ? Introspector.getUberspect(log) : anUberspect;
<br> this.arithmetic = anArithmetic == null ? new JexlArithmetic(true) : anArithmetic;
<br> if (theFunctions != null) {
<br> this.functions = theFunctions;
<br> }
<br> }
<br>
<br>+
<br>+ /**
<br>+ * Gets the default instance of Uberspect.
<br>+ * <p>This is lazily initialized to avoid building a default instance if there
<br>+ * is no use for it. The main reason for not using the default Uberspect instance is to
<br>+ * be able to use a (low level) introspector created with a given logger
<br>+ * instead of the default one.</p>
<br>+ * @param logger the logger to use for the underlying Uberspect
<br>+ * @return Uberspect the default uberspector instance.
<br>+ */
<br>+ public static Uberspect getUberspect(Log logger) {
<br>+ if (logger == null || logger.equals(LogFactory.getLog(JexlEngine.class))) {
<br>+ return UberspectHolder.UBERSPECT;
<br>+ }
<br>+ return new UberspectImpl(logger);
<br>+ }
<br>+
<br>+ /**
<br>+ * Gets this engine underlying uberspect.
<br>+ * @return the uberspect
<br>+ */
<br>+ public Uberspect getUberspect() {
<br>+ return uberspect;
<br>+ }
<br>+
<br> /**
<br> * Sets whether this engine reports debugging information when error occurs.
<br> * <p>This method is <em>not</em> thread safe; it should be called as an optional step of the JexlEngine
<br>@@ -259,7 +281,7 @@
<br> * @param loader the class loader to use
<br> */
<br> public void setClassLoader(ClassLoader loader) {
<br>- uberspect.getIntrospector().setLoader(loader);
<br>+ uberspect.setClassLoader(loader);
<br> }
<br>
<br> /**
<br>@@ -340,7 +362,7 @@
<br> * parsing this expression, or if the expression is neither an
<br> * expression or a reference.
<br> */
<br>- public Expression createExpression(String expression, Info info) {
<br>+ public Expression createExpression(String expression, JexlInfo info) {
<br> // Parse the expression
<br> ASTJexlScript tree = parse(expression, info);
<br> if (tree.jjtGetNumChildren() > 1) {
<br>@@ -371,7 +393,7 @@
<br> * @return A {@link Script} which can be executed using a {@link JexlContext}.
<br> * @throws JexlException if there is a problem parsing the script.
<br> */
<br>- public Script createScript(String scriptText, Info info) {
<br>+ public Script createScript(String scriptText, JexlInfo info) {
<br> if (scriptText == null) {
<br> throw new NullPointerException("scriptText is null");
<br> }
<br>@@ -399,9 +421,9 @@
<br> throw new IOException("Can't read scriptFile (" + scriptFile.getCanonicalPath() + ")");
<br> }
<br> BufferedReader reader = new BufferedReader(new FileReader(scriptFile));
<br>- Info info = null;
<br>+ JexlInfo info = null;
<br> if (debug) {
<br>- info = new Info(scriptFile.getName(), 0, 0);
<br>+ info = createInfo(scriptFile.getName(), 0, 0);
<br> }
<br> return createScript(readerToString(reader), info);
<br>
<br>@@ -426,9 +448,9 @@
<br>
<br> BufferedReader reader = new BufferedReader(
<br> new InputStreamReader(connection.getInputStream()));
<br>- Info info = null;
<br>+ JexlInfo info = null;
<br> if (debug) {
<br>- info = new Info(scriptUrl.toString(), 0, 0);
<br>+ info = createInfo(scriptUrl.toString(), 0, 0);
<br> }
<br> return createScript(readerToString(reader), info);
<br> }
<br>@@ -468,7 +490,7 @@
<br> }
<br> // lets build 1 unique & unused identifiers wrt context
<br> String r0 = "$0";
<br>- for (int s = 0; !isVariableUndefined(context, r0); ++s) {
<br>+ for (int s = 0; context.has(r0); ++s) {
<br> r0 = r0 + s;
<br> }
<br> expr = r0 + (expr.charAt(0) == '[' ? "" : ".") + expr + ";";
<br>@@ -524,10 +546,10 @@
<br> }
<br> // lets build 2 unique & unused identifiers wrt context
<br> String r0 = "$0", r1 = "$1";
<br>- for (int s = 0; !isVariableUndefined(context, r0); ++s) {
<br>+ for (int s = 0; context.has(r0); ++s) {
<br> r0 = r0 + s;
<br> }
<br>- for (int s = 0; !isVariableUndefined(context, r1); ++s) {
<br>+ for (int s = 0; context.has(r1); ++s) {
<br> r1 = r1 + s;
<br> }
<br> // synthetize expr
<br>@@ -560,7 +582,7 @@
<br> public Object invokeMethod(Object obj, String meth, Object... args) {
<br> JexlException xjexl = null;
<br> Object result = null;
<br>- Info info = debugInfo();
<br>+ JexlInfo info = debugInfo();
<br> try {
<br> JexlMethod method = uberspect.getMethod(obj, meth, args, info);
<br> if (method == null && arithmetic.narrowArguments(args)) {
<br>@@ -618,7 +640,7 @@
<br> protected Object doCreateInstance(Object clazz, Object...args) {
<br> JexlException xjexl = null;
<br> Object result = null;
<br>- Info info = debugInfo();
<br>+ JexlInfo info = debugInfo();
<br> try {
<br> Constructor<?> ctor = uberspect.getConstructor(clazz, args, info);
<br> if (ctor == null && arithmetic.narrowArguments(args)) {
<br>@@ -748,7 +770,7 @@
<br> * @return the parsed tree
<br> * @throws JexlException if any error occured during parsing
<br> */
<br>- protected ASTJexlScript parse(CharSequence expression, Info info) {
<br>+ protected ASTJexlScript parse(CharSequence expression, JexlInfo info) {
<br> String expr = cleanExpression(expression);
<br> ASTJexlScript tree = null;
<br> synchronized (parser) {
<br>@@ -778,13 +800,24 @@
<br> }
<br>
<br> /**
<br>+ * Creates a JexlInfo instance.
<br>+ * @param fn url/file name
<br>+ * @param l line number
<br>+ * @param c column number
<br>+ * @return a JexlInfo instance
<br>+ */
<br>+ protected JexlInfo createInfo(String fn, int l, int c) {
<br>+ return new DebugInfo(fn, l, c);
<br>+ }
<br>+
<br>+ /**
<br> * Creates and fills up debugging information.
<br> * <p>This gathers the class, method and line number of the first calling method
<br> * not owned by JexlEngine, UnifiedJEXL or {Script,Expression}Factory.</p>
<br> * @return an Info if debug is set, null otherwise
<br> */
<br>- protected Info debugInfo() {
<br>- Info info = null;
<br>+ protected JexlInfo debugInfo() {
<br>+ JexlInfo info = null;
<br> if (debug) {
<br> Throwable xinfo = new Throwable();
<br> xinfo.fillInStackTrace();
<br>@@ -810,7 +843,7 @@
<br> }
<br> }
<br> if (se != null) {
<br>- info = new Info(se.getClassName() + "." + se.getMethodName(), se.getLineNumber(), 0);
<br>+ info = createInfo(se.getClassName() + "." + se.getMethodName(), se.getLineNumber(), 0);
<br> }
<br> }
<br> return info;
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlException.java Mon Nov 30 19:28:40 2009
<br>@@ -17,7 +17,6 @@
<br> package org.apache.commons.jexl2;
<br>
<br> import org.apache.commons.jexl2.parser.JexlNode;
<br>-import org.apache.commons.jexl2.util.introspection.Info;
<br>
<br> /**
<br> * Wraps any error that might occur during interpretation of a script or expression.
<br>@@ -29,7 +28,7 @@
<br> /** The point of origin for this exception. */
<br> protected final JexlNode mark;
<br> /** The debug info. */
<br>- protected final Info info;
<br>+ protected final JexlInfo info;
<br> /** A marker to use in NPEs stating a null operand error. */
<br> public static final String NULL_OPERAND = "jexl.null";
<br> /**
<br>@@ -61,7 +60,7 @@
<br> * @param dbg the debugging information associated
<br> * @param msg the error message
<br> */
<br>- public JexlException(Info dbg, String msg) {
<br>+ public JexlException(JexlInfo dbg, String msg) {
<br> super(msg);
<br> mark = null;
<br> info = dbg;
<br>@@ -73,7 +72,7 @@
<br> * @param msg the error message
<br> * @param cause the exception causing the error
<br> */
<br>- public JexlException(Info dbg, String msg, Throwable cause) {
<br>+ public JexlException(JexlInfo dbg, String msg, Throwable cause) {
<br> super(msg, cause);
<br> mark = null;
<br> info = dbg;
<br><br>Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlInfo.java (from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/DebugInfo.java)
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlInfo.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlInfo.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/DebugInfo.java&r1=884622&r2=885553&rev=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlInfo.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlInfo.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/DebugInfo.java&r1=884622&r2=885553&rev=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/DebugInfo.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlInfo.java Mon Nov 30 19:28:40 2009
<br>@@ -14,20 +14,15 @@
<br> * See the License for the specific language governing permissions and
<br> * limitations under the License.
<br> */
<br>-package org.apache.commons.jexl2.util.introspection;
<br>+package org.apache.commons.jexl2;
<br>
<br> /**
<br>- * A little class to abstract debugging info.
<br>+ * Interface for objects carrying information usefull to debugging.
<br>+ * @since 1.0
<br> */
<br>-public interface DebugInfo {
<br>- /** A default debug info with (oviously) no information. */
<br>- DebugInfo NONE = new DebugInfo() {
<br>- public String debugString() {
<br>- return "?@?:?";
<br>- }
<br>- };
<br>+public interface JexlInfo {
<br> /**
<br>- * Formats this information.
<br>+ * Formats this information for debugging purpose.
<br> * @return a human readable string.
<br> */
<br> String debugString();
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/Main.java Mon Nov 30 19:28:40 2009
<br>@@ -43,8 +43,8 @@
<br> */
<br> public static void main(String[] args) throws Exception {
<br> JexlEngine engine = new JexlEngine();
<br>- JexlContext context = new JexlContext.Mapped();
<br>- context.setJexlVariable("args", args);
<br>+ JexlContext context = new MapContext();
<br>+ context.set("args", args);
<br> if (args.length == 1) {
<br> Script script = engine.createScript(new File(args[0]));
<br> Object value = script.execute(context);
<br><br>Added: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/MapContext.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/MapContext.java?rev=885553&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/MapContext.java?rev=885553&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/MapContext.java (added)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/MapContext.java Mon Nov 30 19:28:40 2009
<br>@@ -0,0 +1,62 @@
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ * contributor license agreements. See the NOTICE file distributed with
<br>+ * this work for additional information regarding copyright ownership.
<br>+ * The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ * (the "License"); you may not use this file except in compliance with
<br>+ * the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing, software
<br>+ * distributed under the License is distributed on an "AS IS" BASIS,
<br>+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ * See the License for the specific language governing permissions and
<br>+ * limitations under the License.
<br>+ */
<br>+package org.apache.commons.jexl2;
<br>+
<br>+import java.util.HashMap;
<br>+import java.util.Map;
<br>+
<br>+/**
<br>+ * Wraps a map in a context.
<br>+ * <p>Each entry in the map is considered a variable name, value pair.</p>
<br>+ */
<br>+public class MapContext implements JexlContext {
<br>+ /**
<br>+ * The wrapped variable map.
<br>+ */
<br>+ protected final Map<String, Object> map;
<br>+
<br>+ /**
<br>+ * Creates a MapContext on an automatically allocated underlying HashMap.
<br>+ */
<br>+ public MapContext() {
<br>+ this(null);
<br>+ }
<br>+
<br>+ /**
<br>+ * Creates a MapContext wrapping an existing user provided map.
<br>+ * @param vars the variable map
<br>+ */
<br>+ public MapContext(Map<String, Object> vars) {
<br>+ super();
<br>+ map = vars == null ? new HashMap<String, Object>() : vars;
<br>+ }
<br>+
<br>+ /** {@inheritDoc} */
<br>+ public boolean has(String name) {
<br>+ return map.containsKey(name);
<br>+ }
<br>+
<br>+ /** {@inheritDoc} */
<br>+ public Object get(String name) {
<br>+ return map.get(name);
<br>+ }
<br>+
<br>+ /** {@inheritDoc} */
<br>+ public void set(String name, Object value) {
<br>+ map.put(name, value);
<br>+ }
<br>+}
<br><br>Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/MapContext.java
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/UnifiedJEXL.java Mon Nov 30 19:28:40 2009
<br>@@ -19,7 +19,6 @@
<br> import java.util.ArrayList;
<br> import org.apache.commons.jexl2.parser.JexlNode;
<br> import org.apache.commons.jexl2.parser.StringParser;
<br>-import org.apache.commons.jexl2.util.introspection.Info;
<br>
<br> /**
<br> * An evaluator similar to the Unified EL evaluator used in JSP/JSF based on JEXL.
<br>@@ -801,7 +800,7 @@
<br> * @return the AST
<br> * @throws JexlException if an error occur during parsing
<br> */
<br>- private JexlNode toNode(CharSequence expression, Info info) {
<br>+ private JexlNode toNode(CharSequence expression, JexlInfo info) {
<br> return jexl.parse(expression, info);
<br> }
<br>
<br><br>Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java (from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlMethod.java)
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlMethod.java&r1=884622&r2=885553&rev=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlMethod.java&r1=884622&r2=885553&rev=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlMethod.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java Mon Nov 30 19:28:40 2009
<br>@@ -15,7 +15,7 @@
<br> * limitations under the License.
<br> */
<br>
<br>-package org.apache.commons.jexl2.util.introspection;
<br>+package org.apache.commons.jexl2.introspection;
<br>
<br> /**
<br> * Interface used for regular method invocation.
<br>@@ -33,13 +33,13 @@
<br> * invocation method - called when the method invocation should be performed
<br> * and a value returned.
<br>
<br>- * @param o the object
<br>+ * @param obj the object
<br> * @param params method parameters.
<br> * @return the result
<br> * @throws Exception on any error.
<br> */
<br>- Object invoke(Object o, Object[] params) throws Exception;
<br>-
<br>+ Object invoke(Object obj, Object[] params) throws Exception;
<br>+
<br> /**
<br> * specifies if this JexlMethod is cacheable and able to be reused for this
<br> * class of object it was returned for.
<br><br>Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java (from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertyGet.java)
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertyGet.java&r1=884622&r2=885553&rev=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertyGet.java&r1=884622&r2=885553&rev=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertyGet.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java Mon Nov 30 19:28:40 2009
<br>@@ -15,7 +15,7 @@
<br> * limitations under the License.
<br> */
<br>
<br>-package org.apache.commons.jexl2.util.introspection;
<br>+package org.apache.commons.jexl2.introspection;
<br>
<br> /**
<br> * Interface for getting values that appear to be properties.
<br>@@ -31,11 +31,11 @@
<br> /**
<br> * invocation method - called when the 'get action' should be performed and
<br> * a value returned.
<br>- * @param o the object to get the property from.
<br>+ * @param obj the object to get the property from.
<br> * @return the property value.
<br> * @throws Exception on any error.
<br> */
<br>- Object invoke(Object o) throws Exception;
<br>+ Object invoke(Object obj) throws Exception;
<br>
<br> /**
<br> * Specifies if this JexlPropertyGet is cacheable and able to be reused for
<br><br>Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java (from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertySet.java)
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertySet.java&r1=884622&r2=885553&rev=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertySet.java&r1=884622&r2=885553&rev=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/JexlPropertySet.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java Mon Nov 30 19:28:40 2009
<br>@@ -15,7 +15,7 @@
<br> * limitations under the License.
<br> */
<br>
<br>-package org.apache.commons.jexl2.util.introspection;
<br>+package org.apache.commons.jexl2.introspection;
<br>
<br> /**
<br> * Interface used for setting values that appear to be properties.
<br><br>Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Uberspect.java (from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Uberspect.java)
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Uberspect.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Uberspect.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Uberspect.java&r1=884622&r2=885553&rev=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Uberspect.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Uberspect.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Uberspect.java&r1=884622&r2=885553&rev=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/Uberspect.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/Uberspect.java Mon Nov 30 19:28:40 2009
<br>@@ -15,10 +15,11 @@
<br> * limitations under the License.
<br> */
<br>
<br>-package org.apache.commons.jexl2.util.introspection;
<br>+package org.apache.commons.jexl2.introspection;
<br>
<br> import java.util.Iterator;
<br> import java.lang.reflect.Constructor;
<br>+import org.apache.commons.jexl2.JexlInfo;
<br>
<br> /**
<br> * 'Federated' introspection/reflection interface to allow the introspection
<br>@@ -29,18 +30,11 @@
<br> * @version $Id$
<br> */
<br> public interface Uberspect {
<br>- /** Gets underlying introspector.
<br>- * @return the introspector
<br>+ /** Sets the class loader to use when getting a constructor with
<br>+ * a class name parameter.
<br>+ * @param loader the class loader
<br> */
<br>- Introspector getIntrospector();
<br>-
<br>- /**
<br>- * To support iteratives - #foreach().
<br>- * @param info template info.
<br>- * @param obj to get the iterator for.
<br>- * @return an iterator over obj.
<br>- */
<br>- Iterator<?> getIterator(Object obj, DebugInfo info);
<br>+ void setClassLoader(ClassLoader loader);
<br>
<br> /**
<br> * Returns a class constructor.
<br>@@ -49,35 +43,44 @@
<br> * @param info template info
<br> * @return a {@link Constructor}.
<br> */
<br>- Constructor<?> getConstructor(Object ctorHandle, Object[] args, DebugInfo info);
<br>+ Constructor<?> getConstructor(Object ctorHandle, Object[] args, JexlInfo info);
<br> /**
<br>- * Returns a general method, corresponding to $foo.bar( $woogie ).
<br>+ * Returns a JexlMethod.
<br> * @param obj the object
<br> * @param method the method name
<br> * @param args method arguments
<br> * @param info template info
<br> * @return a {@link JexlMethod}.
<br> */
<br>- JexlMethod getMethod(Object obj, String method, Object[] args, DebugInfo info);
<br>+ JexlMethod getMethod(Object obj, String method, Object[] args, JexlInfo info);
<br>
<br> /**
<br>- * Property getter - returns VelPropertyGet appropos for #set($foo =
<br>- * $bar.woogie).
<br>+ * Property getter.
<br>+ * <p>Returns JexlPropertyGet appropos for ${bar.woogie}.
<br> * @param obj the object to get the property from.
<br> * @param identifier property name
<br> * @param info template info
<br> * @return a {@link JexlPropertyGet}.
<br> */
<br>- JexlPropertyGet getPropertyGet(Object obj, Object identifier, DebugInfo info);
<br>+ JexlPropertyGet getPropertyGet(Object obj, Object identifier, JexlInfo info);
<br>
<br> /**
<br>- * Property setter - returns VelPropertySet appropos for #set($foo.bar =
<br>- * "geir").
<br>+ * Property setter.
<br>+ * <p>returns JelPropertySet appropos for ${foo.bar = "geir"}</p>.
<br> * @param obj the object to get the property from.
<br> * @param identifier property name
<br> * @param arg value to set.
<br> * @param info template info
<br> * @return a {@link JexlPropertySet}.
<br> */
<br>- JexlPropertySet getPropertySet(Object obj, Object identifier, Object arg, DebugInfo info);
<br>+ JexlPropertySet getPropertySet(Object obj, Object identifier, Object arg, JexlInfo info);
<br>+
<br>+ /**
<br>+ * Gets an iterator from an object.
<br>+ * @param obj to get the iterator for.
<br>+ * @param info some info.
<br>+ * @return an iterator over obj.
<br>+ */
<br>+ Iterator<?> getIterator(Object obj, JexlInfo info);
<br>+
<br> }
<br>\ No newline at end of file
<br><br>Copied: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java (from r884622, commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java)
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java&r1=884622&r2=885553&rev=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java?p2=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java&p1=commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java&r1=884622&r2=885553&rev=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/UberspectImpl.java Mon Nov 30 19:28:40 2009
<br>@@ -15,16 +15,17 @@
<br> * limitations under the License.
<br> */
<br>
<br>-package org.apache.commons.jexl2.util.introspection;
<br>+package org.apache.commons.jexl2.introspection;
<br>
<br>-import java.lang.reflect.InvocationTargetException;
<br>-import java.lang.reflect.Method;
<br>+import org.apache.commons.jexl2.util.Introspector;
<br> import java.lang.reflect.Constructor;
<br>-import java.util.Collection;
<br> import java.util.Enumeration;
<br> import java.util.Iterator;
<br>-import java.util.Map;
<br>
<br>+import java.util.Map;
<br>+import org.apache.commons.jexl2.JexlInfo;
<br>+import org.apache.commons.jexl2.JexlException;
<br>+import org.apache.commons.jexl2.util.AbstractExecutor;
<br> import org.apache.commons.jexl2.util.ArrayIterator;
<br> import org.apache.commons.jexl2.util.EnumerationIterator;
<br> import org.apache.commons.logging.Log;
<br>@@ -39,109 +40,74 @@
<br> * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26580478&i=1" target="_top" rel="nofollow">henning@...</a>">Henning P. Schmiedehausen</a>
<br> * @version $Id$
<br> */
<br>-public class UberspectImpl extends org.apache.commons.jexl2.util.Introspector implements Uberspect {
<br>- /** {@inheritDoc} */
<br>- public Introspector getIntrospector() {
<br>- return introspector.get();
<br>- }
<br>-
<br>+public class UberspectImpl extends Introspector implements Uberspect {
<br> /**
<br> * Creates a new UberspectImpl.
<br> * @param runtimeLogger the logger used for all logging needs
<br> */
<br> public UberspectImpl(Log runtimeLogger) {
<br>- this(runtimeLogger, new Introspector(runtimeLogger));
<br>- }
<br>-
<br>- /**
<br>- * Creates a new UberspectImpl.
<br>- * @param runtimeLogger the logger used for all logging needs
<br>- * @param intro the introspector to use
<br>- */
<br>- public UberspectImpl(Log runtimeLogger, Introspector intro) {
<br>- super(runtimeLogger, intro);
<br>+ super(runtimeLogger);
<br> }
<br>
<br> /**
<br> * {@inheritDoc}
<br> */
<br> @SuppressWarnings("unchecked")
<br>- public Iterator<?> getIterator(Object obj, DebugInfo info) {
<br>+ public Iterator<?> getIterator(Object obj, JexlInfo info) {
<br>+ if (obj instanceof Iterator<?>) {
<br>+ return ((Iterator<?>) obj);
<br>+ }
<br> if (obj.getClass().isArray()) {
<br> return new ArrayIterator(obj);
<br>- } else if (obj instanceof Collection<?>) {
<br>- return ((Collection<?>) obj).iterator();
<br>- } else if (obj instanceof Map<?,?>) {
<br>+ }
<br>+ if (obj instanceof Map<?,?>) {
<br> return ((Map<?,?>) obj).values().iterator();
<br>- } else if (obj instanceof Iterator<?>) {
<br>- rlog.warn(info.debugString()
<br>- + "The iterative is not resetable; if used more than once, "
<br>- + "this may lead to unexpected results.");
<br>-
<br>- return ((Iterator<?>) obj);
<br>- } else if (obj instanceof Enumeration<?>) {
<br>- rlog.warn(info.debugString()
<br>- + "The iterative is not resetable; if used more than once, "
<br>- + "this may lead to unexpected results.");
<br>+ }
<br>+ if (obj instanceof Enumeration<?>) {
<br> return new EnumerationIterator<Object>((Enumeration<Object>) obj);
<br>- } else {
<br>+ }
<br>+ if (obj instanceof Iterable<?>) {
<br>+ return ((Iterable<?>) obj).iterator();
<br>+ }
<br>+ try {
<br> // look for an iterator() method to support the JDK5 Iterable
<br> // interface or any user tools/DTOs that want to work in
<br> // foreach without implementing the Collection interface
<br>- Class<?> type = obj.getClass();
<br>- try {
<br>- Method iter = type.getMethod("iterator", (Class<?>[]) null);
<br>- Class<?> returns = iter.getReturnType();
<br>- if (Iterator.class.isAssignableFrom(returns)) {
<br>- return (Iterator<?>) iter.invoke(obj, (Object[])null);
<br>- } else {
<br>- rlog.error(info.debugString()
<br>- + "iterator() method does not return a true Iterator.");
<br>- }
<br>- // CSOFF: EmptyBlock
<br>- } catch (NoSuchMethodException nsme) {
<br>- // eat this one, but let all other exceptions thru
<br>- } catch (IllegalArgumentException e) { // CSON: EmptyBlock
<br>- throw new RuntimeException(e);
<br>- } catch (IllegalAccessException e) {
<br>- throw new RuntimeException(e);
<br>- } catch (InvocationTargetException e) {
<br>- throw new RuntimeException(e);
<br>+ AbstractExecutor.Method it = getMethodExecutor(obj, "iterator", null);
<br>+ if (it != null && Iterator.class.isAssignableFrom(it.getReturnType())) {
<br>+ return (Iterator<Object>) it.execute(obj, null);
<br> }
<br>+ } catch(Exception xany) {
<br>+ throw new JexlException(info, "unable to generate iterator()", xany);
<br> }
<br>-
<br>- /* we have no clue what this is */
<br>- rlog.warn(info.toString()
<br>- + "Could not determine type of iterator");
<br>-
<br> return null;
<br> }
<br>
<br> /**
<br> * {@inheritDoc}
<br> */
<br>- public Constructor<?> getConstructor(Object ctorHandle, Object[] args, DebugInfo info) {
<br>+ public Constructor<?> getConstructor(Object ctorHandle, Object[] args, JexlInfo info) {
<br> return getConstructor(ctorHandle, args);
<br> }
<br>
<br> /**
<br> * {@inheritDoc}
<br> */
<br>- public JexlMethod getMethod(Object obj, String method, Object[] args, DebugInfo info) {
<br>+ public JexlMethod getMethod(Object obj, String method, Object[] args, JexlInfo info) {
<br> return getMethodExecutor(obj, method, args);
<br> }
<br>
<br> /**
<br> * {@inheritDoc}
<br> */
<br>- public JexlPropertyGet getPropertyGet(Object obj, Object identifier, DebugInfo info) {
<br>+ public JexlPropertyGet getPropertyGet(Object obj, Object identifier, JexlInfo info) {
<br> return getGetExecutor(obj, identifier);
<br> }
<br>
<br> /**
<br> * {@inheritDoc}
<br> */
<br>- public JexlPropertySet getPropertySet(final Object obj, final Object identifier, Object arg, DebugInfo info) {
<br>+ public JexlPropertySet getPropertySet(final Object obj, final Object identifier, Object arg, JexlInfo info) {
<br> return getSetExecutor(obj, identifier, arg);
<br> }
<br> }
<br>\ No newline at end of file
<br><br>Added: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/package.html
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/package.html?rev=885553&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/package.html?rev=885553&view=auto</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/package.html (added)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/package.html Mon Nov 30 19:28:40 2009
<br>@@ -0,0 +1,35 @@
<br>+<html>
<br>+<!--
<br>+ Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ contributor license agreements. See the NOTICE file distributed with
<br>+ this work for additional information regarding copyright ownership.
<br>+ The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ (the "License"); you may not use this file except in compliance with
<br>+ the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+ Unless required by applicable law or agreed to in writing, software
<br>+ distributed under the License is distributed on an "AS IS" BASIS,
<br>+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ See the License for the specific language governing permissions and
<br>+ limitations under the License.
<br>+-->
<br>+ <head>
<br>+ <title>Package Documentation for org.apache.commons.jexl2.introspection Package</title>
<br>+ </head>
<br>+ <body bgcolor="white">
<br>+ Provides high-level introspective services.
<br>+ <br/>
<br>+ <p>
<br>+ The Uberspect, JexlMethod, JexlPropertyGet and JexlPropertySet interfaces
<br>+ form the exposed face of introspective services.
<br>+ </p>
<br>+ <p>
<br>+ The Uberspectimpl is the concrete class implementing the Uberspect interface.
<br>+ Deriving from this class is the preferred way of augmenting Jexl introspective
<br>+ capabilities when special needs to be fullfilled or when default behaviors
<br>+ need to be modified.
<br>+ </p>
<br>+</body>
<br>+</html>
<br><br>Propchange: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/introspection/package.html
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/package.html Mon Nov 30 19:28:40 2009
<br>@@ -59,7 +59,7 @@
<br>
<br> // Create a context and add data
<br> JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("foo", new Foo() );
<br>+ jc.set("foo", new Foo() );
<br>
<br> // Now evaluate the expression, getting the result
<br> Object o = e.evaluate(jc);
<br>@@ -135,7 +135,7 @@
<br> JexlEngine jexl = nex JexlEngine();
<br>
<br> JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("quuxClass", quux.class);
<br>+ jc.set("quuxClass", quux.class);
<br>
<br> Expression create = jexl.createExpression("quux = new(quuxClass, 'xuuq', 100)");
<br> Expression assign = jexl.createExpression("quux.froboz.value = 10");
<br>@@ -220,7 +220,7 @@
<br> jexl.setFunctions(funcs);
<br>
<br> JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("pi", Math.PI);
<br>+ jc.set("pi", Math.PI);
<br>
<br> e = JEXL.createExpression("math:cos(pi)");
<br> o = e.evaluate(jc);
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlNode.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlNode.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlNode.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlNode.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/JexlNode.java Mon Nov 30 19:28:40 2009
<br>@@ -16,15 +16,14 @@
<br> */
<br> package org.apache.commons.jexl2.parser;
<br>
<br>-import org.apache.commons.jexl2.util.introspection.Info;
<br>-import org.apache.commons.jexl2.util.introspection.DebugInfo;
<br>+import org.apache.commons.jexl2.JexlInfo;
<br>
<br> /**
<br> * Base class for parser nodes - holds an 'image' of the token for later use.
<br> *
<br> * @since 2.0
<br> */
<br>-public abstract class JexlNode extends SimpleNode implements DebugInfo {
<br>+public abstract class JexlNode extends SimpleNode implements JexlInfo {
<br> /** token value. */
<br> public String image;
<br>
<br>@@ -36,11 +35,11 @@
<br> super(p, id);
<br> }
<br>
<br>- public Info getInfo() {
<br>+ public JexlInfo getInfo() {
<br> JexlNode node = this;
<br> while (node != null) {
<br>- if (node.value instanceof Info) {
<br>- return (Info) node.value;
<br>+ if (node.value instanceof JexlInfo) {
<br>+ return (JexlInfo) node.value;
<br> }
<br> node = node.jjtGetParent();
<br> }
<br>@@ -49,7 +48,7 @@
<br>
<br> /** {@inheritDoc} */
<br> public String debugString() {
<br>- Info info = getInfo();
<br>+ JexlInfo info = getInfo();
<br> return info != null? info.debugString() : "";
<br> }
<br> }
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/parser/Parser.jjt Mon Nov 30 19:28:40 2009
<br>@@ -39,11 +39,11 @@
<br> package org.apache.commons.jexl2.parser;
<br>
<br> import java.io.Reader;
<br>-import org.apache.commons.jexl2.util.introspection.Info;
<br>+import org.apache.commons.jexl2.JexlInfo;
<br>
<br> public class Parser extends StringParser
<br> {
<br>- public ASTJexlScript parse(Reader reader, Info info)
<br>+ public ASTJexlScript parse(Reader reader, JexlInfo info)
<br> throws ParseException
<br> {
<br> ReInit(reader);
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java Mon Nov 30 19:28:40 2009
<br>@@ -159,7 +159,7 @@
<br> *
<br> * Current implementation only gives access to ENGINE_SCOPE binding.
<br> */
<br>- private static class JexlContextWrapper implements JexlContext.Nullable {
<br>+ private static class JexlContextWrapper implements JexlContext {
<br> /** The engine context. */
<br> private final ScriptContext engineContext;
<br> /**
<br>@@ -172,12 +172,12 @@
<br> }
<br>
<br> /** {@inheritDoc} */
<br>- public Object getJexlVariable(String name) {
<br>+ public Object get(String name) {
<br> return engineContext.getAttribute(name);
<br> }
<br>
<br> /** {@inheritDoc} */
<br>- public void setJexlVariable(String name, Object value) {
<br>+ public void set(String name, Object value) {
<br> int scope = engineContext.getAttributesScope(name);
<br> if (scope == -1) { // not found, default to engine
<br> scope = ScriptContext.ENGINE_SCOPE;
<br>@@ -186,7 +186,7 @@
<br> }
<br>
<br> /** {@inheritDoc} */
<br>- public boolean definesJexlVariable(String name) {
<br>+ public boolean has(String name) {
<br> Bindings bnd = engineContext.getBindings(ScriptContext.ENGINE_SCOPE);
<br> return bnd.containsKey(name);
<br> }
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/AbstractExecutor.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/AbstractExecutor.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/AbstractExecutor.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/AbstractExecutor.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/AbstractExecutor.java Mon Nov 30 19:28:40 2009
<br>@@ -16,9 +16,9 @@
<br> */
<br> package org.apache.commons.jexl2.util;
<br> import org.apache.commons.jexl2.util.introspection.MethodKey;
<br>-import org.apache.commons.jexl2.util.introspection.JexlMethod;
<br>-import org.apache.commons.jexl2.util.introspection.JexlPropertySet;
<br>-import org.apache.commons.jexl2.util.introspection.JexlPropertyGet;
<br>+import org.apache.commons.jexl2.introspection.JexlMethod;
<br>+import org.apache.commons.jexl2.introspection.JexlPropertySet;
<br>+import org.apache.commons.jexl2.introspection.JexlPropertyGet;
<br> import java.lang.reflect.InvocationTargetException;
<br>
<br> /**
<br>@@ -306,8 +306,8 @@
<br> }
<br>
<br> /** {@inheritDoc} */
<br>- public final Object invoke(Object obj, Object[] args) throws Exception {
<br>- return execute(obj, args);
<br>+ public final Object invoke(Object obj, Object[] params) throws Exception {
<br>+ return execute(obj, params);
<br> }
<br>
<br> /** {@inheritDoc} */
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java Mon Nov 30 19:28:40 2009
<br>@@ -20,12 +20,10 @@
<br> import java.lang.reflect.Method;
<br> import java.lang.reflect.Constructor;
<br>
<br>-import org.apache.commons.jexl2.util.introspection.Uberspect;
<br>-import org.apache.commons.jexl2.util.introspection.UberspectImpl;
<br>+import org.apache.commons.jexl2.util.introspection.IntrospectorBase;
<br> import org.apache.commons.jexl2.util.introspection.MethodKey;
<br>
<br> import org.apache.commons.logging.Log;
<br>-import org.apache.commons.logging.LogFactory;
<br>
<br> /**
<br> * Default introspection services.
<br>@@ -33,103 +31,18 @@
<br> * @since 1.0
<br> */
<br> public class Introspector {
<br>-
<br>- private static class UberspectHolder{// Implements init on demand holder idiom
<br>- /** The default uberspector that handles all introspection patterns. */
<br>- private static final Uberspect UBERSPECT = new UberspectImpl(LogFactory.getLog(Introspector.class));
<br>- }
<br>-
<br> /** The logger to use for all warnings & errors. */
<br> protected final Log rlog;
<br>- /** The (low level) introspector to use for introspection services. */
<br>- protected final Reference introspector;
<br>-
<br>- /**
<br>- * A soft reference to an Introspector.
<br>- * <p>
<br>- * If memory pressure becomes critical, this will allow the introspector to be GCed;
<br>- * in turn, classes it introspected that are no longer in use may be GCed as well.
<br>- * </p>
<br>- */
<br>- protected final class Reference {
<br>- /**
<br>- * The introspector logger.
<br>- */
<br>- private final Log logger;
<br>- /**
<br>- * The soft reference to the introspector currently in use.
<br>- */
<br>- private volatile SoftReference<org.apache.commons.jexl2.util.introspection.Introspector> ref;
<br>- /**
<br>- * Creates a new instance.
<br>- * @param theLogger logger used by the underlying introspector instance
<br>- * @param is the underlying introspector instance
<br>- */
<br>- protected Reference(Log theLogger, org.apache.commons.jexl2.util.introspection.Introspector is) {
<br>- logger = theLogger;
<br>- ref = new SoftReference<org.apache.commons.jexl2.util.introspection.Introspector>(is);
<br>- }
<br>-
<br>- /**
<br>- * Creates a new instance.
<br>- * @param theLogger logger used by the underlying introspector instance
<br>- */
<br>- protected Reference(Log theLogger) {
<br>- this(theLogger, new org.apache.commons.jexl2.util.introspection.Introspector(theLogger));
<br>- }
<br>-
<br>- /**
<br>- * Gets the current introspector.
<br>- * <p>If the reference has been collected, this method will recreate the underlying introspector.</p>
<br>- * @return the introspector
<br>- */
<br>- // CSOFF: DoubleCheckedLocking
<br>- public org.apache.commons.jexl2.util.introspection.Introspector get() {
<br>- org.apache.commons.jexl2.util.introspection.Introspector intro = ref.get();
<br>- if (intro == null) {
<br>- // double checked locking (fixed by Java 5 memory model).
<br>- synchronized(this) {
<br>- intro = ref.get();
<br>- if (intro == null) {
<br>- intro = new org.apache.commons.jexl2.util.introspection.Introspector(logger);
<br>- ref = new SoftReference<org.apache.commons.jexl2.util.introspection.Introspector>(intro);
<br>- }
<br>- }
<br>- }
<br>- return intro;
<br>- }
<br>- // CSON: DoubleCheckedLocking
<br>- }
<br>-
<br>- /**
<br>- * Gets the default instance of Uberspect.
<br>- * <p>This is lazily initialized to avoid building a default instance if there
<br>- * is no use for it. The main reason for not using the default Uberspect instance is to
<br>- * be able to use a (low level) introspector created with a given logger
<br>- * instead of the default one.</p>
<br>- * @return Uberspect the default uberspector instance.
<br>- */
<br>- public static Uberspect getUberspect() {
<br>- return UberspectHolder.UBERSPECT;
<br>- }
<br>-
<br>- /**
<br>- * Creates a new instance of Uberspect.
<br>- * @param logger the logger used by this Uberspect.
<br>- * @return the new instance
<br>- */
<br>- public static Uberspect getUberspect(Log logger) {
<br>- return new UberspectImpl(logger);
<br>- }
<br>-
<br>+ /** The soft reference to the introspector currently in use. */
<br>+ private volatile SoftReference<IntrospectorBase> ref;
<br>+
<br> /**
<br> * Creates an introspector.
<br> * @param log the logger to use for warnings.
<br>- * @param is the low level introspector.
<br> */
<br>- public Introspector(Log log, org.apache.commons.jexl2.util.introspection.Introspector is) {
<br>+ protected Introspector(Log log) {
<br> rlog = log;
<br>- introspector = new Reference(log, is);
<br>+ ref = new SoftReference<IntrospectorBase>(null);
<br> }
<br>
<br> /**
<br>@@ -161,6 +74,37 @@
<br> }
<br>
<br> /**
<br>+ * Gets the current introspector base.
<br>+ * <p>If the reference has been collected, this method will recreate the underlying introspector.</p>
<br>+ * @return the introspector
<br>+ */
<br>+ // CSOFF: DoubleCheckedLocking
<br>+ protected final IntrospectorBase base() {
<br>+ IntrospectorBase intro = ref.get();
<br>+ if (intro == null) {
<br>+ // double checked locking (fixed by Java 5 memory model).
<br>+ synchronized(this) {
<br>+ intro = ref.get();
<br>+ if (intro == null) {
<br>+ intro = new IntrospectorBase(rlog);
<br>+ ref = new SoftReference<IntrospectorBase>(intro);
<br>+ }
<br>+ }
<br>+ }
<br>+ return intro;
<br>+ }
<br>+ // CSON: DoubleCheckedLocking
<br>+
<br>+ /**
<br>+ * Sets the underlying class loader for class solving resolution.
<br>+ * @param loader the loader to use
<br>+ */
<br>+ public void setClassLoader(ClassLoader loader) {
<br>+ base().setLoader(loader);
<br>+ }
<br>+
<br>+
<br>+ /**
<br> * Gets the method defined by <code>name</code> and
<br> * <code>params</code> for the Class <code>c</code>.
<br> *
<br>@@ -174,7 +118,7 @@
<br> * CSOFF: RedundantThrows
<br> */
<br> protected final Method getMethod(Class<?> c, String name, Object[] params) throws IllegalArgumentException {
<br>- return introspector.get().getMethod(c, new MethodKey(name, params));
<br>+ return base().getMethod(c, new MethodKey(name, params));
<br> }
<br>
<br> /**
<br>@@ -188,7 +132,17 @@
<br> * CSOFF: RedundantThrows
<br> */
<br> protected final Method getMethod(Class<?> c, MethodKey key) throws IllegalArgumentException {
<br>- return introspector.get().getMethod(c, key);
<br>+ return base().getMethod(c, key);
<br>+ }
<br>+
<br>+
<br>+ /**
<br>+ * Gets the accessible methods names known for a given class.
<br>+ * @param c the class
<br>+ * @return the class method names
<br>+ */
<br>+ public final String[] getMethodNames(Class<?> c) {
<br>+ return base().getMethodNames(c);
<br> }
<br>
<br> /**
<br>@@ -208,7 +162,7 @@
<br> } else {
<br> return null;
<br> }
<br>- return introspector.get().getConstructor(clazz, new MethodKey(className, args));
<br>+ return base().getConstructor(clazz, new MethodKey(className, args));
<br> }
<br>
<br> /**
<br>@@ -225,7 +179,7 @@
<br>
<br> /**
<br> * Return a property getter.
<br>- * @param obj the object to get the property from.
<br>+ * @param obj the object to base the property from.
<br> * @param identifier property name
<br> * @return a {@link AbstractExecutor.Get}.
<br> */
<br>@@ -271,7 +225,7 @@
<br>
<br> /**
<br> * Return a property setter.
<br>- * @param obj the object to get the property from.
<br>+ * @param obj the object to base the property from.
<br> * @param identifier property name (or identifier)
<br> * @param arg value to set
<br> * @return a {@link AbstractExecutor.Set}.
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/IntrospectorBase.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/IntrospectorBase.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/IntrospectorBase.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/IntrospectorBase.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/IntrospectorBase.java Mon Nov 30 19:28:40 2009
<br>@@ -90,14 +90,22 @@
<br> * @param key Key of the method being searched for
<br> * @return The desired Method object.
<br> * @throws IllegalArgumentException When the parameters passed in can not be used for introspection.
<br>- * @throws MethodKey.AmbiguousException When the method map contains more than
<br>- * one match for the requested signature.
<br> *
<br> */
<br> //CSOFF: RedundantThrows
<br> public Method getMethod(Class<?> c, MethodKey key) {
<br>- ClassMap classMap = getMap(c);
<br>- return classMap.findMethod(key);
<br>+ try {
<br>+ ClassMap classMap = getMap(c);
<br>+ return classMap.findMethod(key);
<br>+ } catch (MethodKey.AmbiguousException ae) {
<br>+ // whoops. Ambiguous. Make a nice log message and return null...
<br>+ if (rlog != null) {
<br>+ rlog.error("ambiguous method invocation: "
<br>+ + c.getName() + "."
<br>+ + key.debugString());
<br>+ }
<br>+ }
<br>+ return null;
<br>
<br> }
<br> // CSON: RedundantThrows
<br>@@ -113,7 +121,6 @@
<br> }
<br> ClassMap classMap = getMap(c);
<br> return classMap.getMethodNames();
<br>-
<br> }
<br>
<br> /**
<br>@@ -150,8 +157,6 @@
<br> * @param key Key of the constructor being searched for
<br> * @return The desired Constructor object.
<br> * @throws IllegalArgumentException When the parameters passed in can not be used for introspection.
<br>- * @throws MethodKey.AmbiguousException When the method map contains more than
<br>- * one match for the requested signature.
<br> */
<br> public Constructor<?> getConstructor(final MethodKey key) {
<br> return getConstructor(null, key);
<br>@@ -163,57 +168,64 @@
<br> * @param key Key of the constructor being searched for
<br> * @return The desired Constructor object.
<br> * @throws IllegalArgumentException When the parameters passed in can not be used for introspection.
<br>- * @throws MethodKey.AmbiguousException When the method map contains more than
<br>- * one match for the requested signature.
<br> */
<br> //CSOFF: RedundantThrows
<br> public Constructor<?> getConstructor(final Class<?> c, final MethodKey key) {
<br>- Constructor<?> ctor = null;
<br>- synchronized(constructorsMap) {
<br>- ctor = constructorsMap.get(key);
<br>- // that's a clear miss
<br>- if (CTOR_MISS.equals(ctor)) {
<br>- return null;
<br>- }
<br>- // let's introspect...
<br>- if (ctor == null) {
<br>- final String cname = key.getMethod();
<br>- // do we know about this class?
<br>- Class<?> clazz = constructibleClasses.get(cname);
<br>- try {
<br>- // do find the most specific ctor
<br>- if (clazz == null) {
<br>- if (c != null && c.getName().equals(key.getMethod())) {
<br>- clazz = c;
<br>+ try {
<br>+ Constructor<?> ctor = null;
<br>+ synchronized(constructorsMap) {
<br>+ ctor = constructorsMap.get(key);
<br>+ // that's a clear miss
<br>+ if (CTOR_MISS.equals(ctor)) {
<br>+ return null;
<br>+ }
<br>+ // let's introspect...
<br>+ if (ctor == null) {
<br>+ final String cname = key.getMethod();
<br>+ // do we know about this class?
<br>+ Class<?> clazz = constructibleClasses.get(cname);
<br>+ try {
<br>+ // do find the most specific ctor
<br>+ if (clazz == null) {
<br>+ if (c != null && c.getName().equals(key.getMethod())) {
<br>+ clazz = c;
<br>+ } else {
<br>+ clazz = loader.loadClass(cname);
<br>+ }
<br>+ // add it to list of known loaded classes
<br>+ constructibleClasses.put(cname, clazz);
<br>+ }
<br>+ List<Constructor<?>> l = new LinkedList<Constructor<?>>();
<br>+ for(Constructor<?> ictor : clazz.getConstructors()) {
<br>+ l.add(ictor);
<br>+ }
<br>+ // try to find one
<br>+ ctor = key.getMostSpecificConstructor(l);
<br>+ if (ctor != null) {
<br>+ constructorsMap.put(key, ctor);
<br> } else {
<br>- clazz = loader.loadClass(cname);
<br>+ constructorsMap.put(key, CTOR_MISS);
<br> }
<br>- // add it to list of known loaded classes
<br>- constructibleClasses.put(cname, clazz);
<br>- }
<br>- List<Constructor<?>> l = new LinkedList<Constructor<?>>();
<br>- for(Constructor<?> ictor : clazz.getConstructors()) {
<br>- l.add(ictor);
<br>- }
<br>- // try to find one
<br>- ctor = key.getMostSpecificConstructor(l);
<br>- if (ctor != null) {
<br>- constructorsMap.put(key, ctor);
<br>- } else {
<br>- constructorsMap.put(key, CTOR_MISS);
<br>- }
<br>- } catch(ClassNotFoundException xnotfound) {
<br>- if (rlog.isDebugEnabled()) {
<br>- rlog.debug("could not load class " + cname, xnotfound);
<br>+ } catch(ClassNotFoundException xnotfound) {
<br>+ if (rlog.isDebugEnabled()) {
<br>+ rlog.debug("could not load class " + cname, xnotfound);
<br>+ }
<br>+ ctor = null;
<br>+ } catch(MethodKey.AmbiguousException xambiguous) {
<br>+ rlog.warn("ambiguous ctor detected for " + cname, xambiguous);
<br>+ ctor = null;
<br> }
<br>- ctor = null;
<br>- } catch(MethodKey.AmbiguousException xambiguous) {
<br>- rlog.warn("ambiguous ctor detected for " + cname, xambiguous);
<br>- ctor = null;
<br> }
<br> }
<br>+ return ctor;
<br>+ } catch (MethodKey.AmbiguousException ae) {
<br>+ // whoops. Ambiguous. Make a nice log message and return null...
<br>+ if (rlog != null) {
<br>+ rlog.error("ambiguous constructor invocation: new "
<br>+ + key.debugString());
<br>+ }
<br> }
<br>- return ctor;
<br>+ return null;
<br> }
<br> // CSON: RedundantThrows
<br>
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/package.html Mon Nov 30 19:28:40 2009
<br>@@ -19,37 +19,18 @@
<br> <title>Package Documentation for org.apache.commons.jexl2.introspection Package</title>
<br> </head>
<br> <body bgcolor="white">
<br>- Provides low & high-level introspective services.
<br>- <br/><br/>
<br>- <p>
<br>- <ul>
<br>- <li><a href="#low">Low level</a></li>
<br>- <li><a href="#high">High level</a></li>
<br>- </ul>
<br>- </p>
<br>+ Provides low-level introspective services.
<br>+ <br/>
<br> <h2><a name="low">Low level</a></h2>
<br> <p>
<br>- The IntrospectorBase, Introspector, ClassMap, IntrospectionUtils form the
<br>+ The IntrospectorBase, ClassMap, MethodKey, MethodMap form the
<br> base of the introspection service. They allow to describe classes and their
<br>- methods, keeping them in a cache (@see Introspector) to speed up property
<br>+ methods, keeping them in a cache (@see IntrospectorBase) to speed up property
<br> getters/setters and method discovery used during expression evaluation.
<br> </p>
<br> <p>
<br> The cache materialized in Introspector creates one entry per class containing a map of all
<br> accessible public methods keyed by name and signature.
<br> </p>
<br>-
<br>- <h2><a name="high">High level</a></h2>
<br>-
<br>- <p>
<br>- The Uberspect, JexlMethod, JexlPropertyGet and JexlPropertySet interfaces
<br>- form the exposed face of introspective services.
<br>- </p>
<br>- <p>
<br>- The Uberspectimpl is the concrete class implementing the Uberspect interface.
<br>- Deriving from this class is the preferred way of augmenting Jexl introspective
<br>- capabilities when special needs to be fullfilled or when default behaviors
<br>- need to be modified.
<br>- </p>
<br> </body>
<br> </html>
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArithmeticTest.java Mon Nov 30 19:28:40 2009
<br>@@ -160,7 +160,7 @@
<br> */
<br> public void testDivideByZero() throws Exception {
<br> Map<String,Object> vars = new HashMap<String,Object>();
<br>- JexlContext context = new JexlContext.Mapped(vars);
<br>+ JexlContext context = new MapContext(vars);
<br> vars.put("aByte", new Byte((byte) 1));
<br> vars.put("aShort", new Short((short) 2));
<br> vars.put("aInteger", new Integer(3));
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayLiteralTest.java Mon Nov 30 19:28:40 2009
<br>@@ -26,7 +26,7 @@
<br>
<br> public void testLiteralWithStrings() throws Exception {
<br> Expression e = JEXL.createExpression( "[ 'foo' , 'bar' ]" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> Object[] check = { "foo", "bar" };
<br>@@ -35,7 +35,7 @@
<br>
<br> public void testLiteralWithOneEntry() throws Exception {
<br> Expression e = JEXL.createExpression( "[ 'foo' ]" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> Object[] check = { "foo" };
<br>@@ -44,7 +44,7 @@
<br>
<br> public void testLiteralWithNumbers() throws Exception {
<br> Expression e = JEXL.createExpression( "[ 5.0 , 10 ]" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> Object[] check = { new Float(5), new Integer(10) };
<br>@@ -53,7 +53,7 @@
<br>
<br> public void testLiteralWithIntegers() throws Exception {
<br> Expression e = JEXL.createExpression( "[ 5 , 10 ]" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> int[] check = { 5, 10 };
<br>@@ -62,7 +62,7 @@
<br>
<br> public void testSizeOfSimpleArrayLiteral() throws Exception {
<br> Expression e = JEXL.createExpression( "size([ 'foo' , 'bar' ])" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> assertEquals( new Integer( 2 ), o );
<br>@@ -70,7 +70,7 @@
<br>
<br> public void notestCallingMethodsOnNewMapLiteral() throws Exception {
<br> Expression e = JEXL.createExpression( "size({ 'foo' : 'bar' }.values())" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> assertEquals( new Integer( 1 ), o );
<br>@@ -78,7 +78,7 @@
<br>
<br> public void testNotEmptySimpleArrayLiteral() throws Exception {
<br> Expression e = JEXL.createExpression( "empty([ 'foo' , 'bar' ])" );
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br>
<br> Object o = e.evaluate( jc );
<br> assertFalse( ( (Boolean) o ).booleanValue() );
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/AssignTest.java Mon Nov 30 19:28:40 2009
<br>@@ -79,7 +79,7 @@
<br> public void testAntish() throws Exception {
<br> Expression assign = ENGINE.createExpression("froboz.value = 10");
<br> Expression check = ENGINE.createExpression("froboz.value");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Object o = assign.evaluate(jc);
<br> assertEquals("Result is not 10", new Integer(10), o);
<br> o = check.evaluate(jc);
<br>@@ -89,9 +89,9 @@
<br> public void testBeanish() throws Exception {
<br> Expression assign = ENGINE.createExpression("froboz.value = 10");
<br> Expression check = ENGINE.createExpression("froboz.value");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Froboz froboz = new Froboz(-169);
<br>- jc.setJexlVariable("froboz", froboz);
<br>+ jc.set("froboz", froboz);
<br> Object o = assign.evaluate(jc);
<br> assertEquals("Result is not 10", new Integer(10), o);
<br> o = check.evaluate(jc);
<br>@@ -100,9 +100,9 @@
<br>
<br> public void testAmbiguous() throws Exception {
<br> Expression assign = ENGINE.createExpression("froboz.nosuchbean = 10");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Froboz froboz = new Froboz(-169);
<br>- jc.setJexlVariable("froboz", froboz);
<br>+ jc.set("froboz", froboz);
<br> Object o = null;
<br> try {
<br> o = assign.evaluate(jc);
<br>@@ -120,9 +120,9 @@
<br> public void testArray() throws Exception {
<br> Expression assign = ENGINE.createExpression("froboz[\"value\"] = 10");
<br> Expression check = ENGINE.createExpression("froboz[\"value\"]");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Froboz froboz = new Froboz(0);
<br>- jc.setJexlVariable("froboz", froboz);
<br>+ jc.set("froboz", froboz);
<br> Object o = assign.evaluate(jc);
<br> assertEquals("Result is not 10", new Integer(10), o);
<br> o = check.evaluate(jc);
<br>@@ -130,8 +130,8 @@
<br> }
<br>
<br> public void testMore() throws Exception {
<br>- JexlContext jc = new JexlContext.Mapped();
<br>- jc.setJexlVariable("quuxClass", Quux.class);
<br>+ JexlContext jc = new MapContext();
<br>+ jc.set("quuxClass", Quux.class);
<br> Expression create = ENGINE.createExpression("quux = new(quuxClass, 'xuuq', 100)");
<br> Expression assign = ENGINE.createExpression("quux.froboz.value = 10");
<br> Expression check = ENGINE.createExpression("quux[\"froboz\"].value");
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.java?rev=885553&r1=885552&r2=885553&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.java?rev=885553&r1=885552&r2=885553&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/BlockTest.java Mon Nov 30 19:28:40 2009
<br>@@ -33,44 +33,44 @@
<br>
<br> public void testBlockSimple() throws Exception {
<br> Expression e = JEXL.createExpression("if (true) { 'hello'; }");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Object o = e.evaluate(jc);
<br> assertEquals("Result is wrong", "hello", o);
<br> }
<br>
<br> public void testBlockExecutesAll() throws Exception {
<br> Expression e = JEXL.createExpression("if (true) { x = 'Hello'; y = 'World';}");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Object o = e.evaluate(jc);
<br>- assertEquals("First result is wrong", "Hello", jc.getJexlVariable("x"));
<br>- assertEquals("Second result is wrong", "World", jc.getJexlVariable("y"));
<br>+ assertEquals("First result is wrong", "Hello", jc.get("x"));
<br>+ assertEquals("Second result is wrong", "World", jc.get("y"));
<br> assertEquals("Block result is wrong", "World", o);
<br> }
<br>
<br> public void testEmptyBlock() throws Exception {
<br> Expression e = JEXL.createExpression("if (true) { }");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Object o = e.evaluate(jc);
<br> assertNull("Result is wrong", o);
<br> }
<br>
<br> public void testBlockLastExecuted01() throws Exception {
<br> Expression e = JEXL.createExpression("if (true) { x = 1; } else { x = 2; }");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Object o = e.evaluate(jc);
<br> assertEquals("Block result is wrong", new Integer(1), o);
<br> }
<br>
<br> public void testBlockLastExecuted02() throws Exception {
<br> Expression e = JEXL.createExpression("if (false) { x = 1; } else { x = 2; }");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Object o = e.evaluate(jc);
<br> assertEquals("Block result is wrong", new Integer(2), o);
<br> }
<br>
<br> public void testNestedBlock() throws Exception {
<br> Expression e = JEXL.createExpression("if (true) { x = 'hello'; y = 'world';" + " if (true) { x; } y; }");
<br>- JexlContext jc = new JexlContext.Mapped();
<br>+ JexlContext jc = new MapContext();
<br> Object o = e.evaluate(jc);
<br> assertEquals("Block result is wrong", "world", o);
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26580309
svn commit: r885546 - /commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/
2009-11-30T11:19:01Z
2009-11-30T11:19:01Z
henrib-2
Author: henrib
<br>Date: Mon Nov 30 19:19:01 2009
<br>New Revision: 885546
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885546&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885546&view=rev</a><br>Log:
<br>JEXL-92: follow up on Rahul's comments (JexlContext exposes set/get/has);
<br>moved JexlContext.Mapped as MapContext;
<br>moved Uberspect & related classes to oac.jexl2.introspection;
<br>moved DebugInfo & JexlInfo to oac.jexl2
<br><br>Removed:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/context/
<br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26578791
svn commit: r885514 - in /commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util: ListSetExecutor.java MapGetExecutor.java MapSetExecutor.java
2009-11-30T09:43:43Z
2009-11-30T09:43:43Z
sebb-3
Author: sebb
<br>Date: Mon Nov 30 17:43:42 2009
<br>New Revision: 885514
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885514&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885514&view=rev</a><br>Log:
<br>Document why OK to suppress raw type cast warnings
<br><br>Modified:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListSetExecutor.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapGetExecutor.java
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapSetExecutor.java
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListSetExecutor.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListSetExecutor.java?rev=885514&r1=885513&r2=885514&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListSetExecutor.java?rev=885514&r1=885513&r2=885514&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListSetExecutor.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/ListSetExecutor.java Mon Nov 30 17:43:42 2009
<br>@@ -51,12 +51,12 @@
<br> }
<br>
<br> /** {@inheritDoc} */
<br>- @SuppressWarnings("unchecked")
<br> @Override
<br> public Object execute(final Object obj, Object value) {
<br> if (method == ARRAY_SET) {
<br> java.lang.reflect.Array.set(obj, property.intValue(), value);
<br> } else {
<br>+ @SuppressWarnings("unchecked") // LSE should only be created for array or list types
<br> final List<Object> list = (List<Object>) obj;
<br> list.set(property.intValue(), value);
<br> }
<br>@@ -64,7 +64,6 @@
<br> }
<br>
<br> /** {@inheritDoc} */
<br>- @SuppressWarnings("unchecked")
<br> @Override
<br> public Object tryExecute(final Object obj, Object key, Object value) {
<br> if (obj != null && method != null
<br>@@ -73,6 +72,7 @@
<br> if (method == ARRAY_SET) {
<br> Array.set(obj, ((Integer) key).intValue(), value);
<br> } else {
<br>+ @SuppressWarnings("unchecked") // LSE should only be created for array or list types
<br> final List<Object> list = (List<Object>) obj;
<br> list.set(((Integer) key).intValue(), value);
<br> }
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapGetExecutor.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapGetExecutor.java?rev=885514&r1=885513&r2=885514&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapGetExecutor.java?rev=885514&r1=885513&r2=885514&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapGetExecutor.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapGetExecutor.java Mon Nov 30 17:43:42 2009
<br>@@ -52,20 +52,20 @@
<br> * @param obj the map.
<br> * @return map.get(property)
<br> */
<br>- @SuppressWarnings("unchecked")
<br> @Override
<br> public Object execute(final Object obj) {
<br>+ @SuppressWarnings("unchecked") // ctor only allows Map instances - see discover() method
<br> final Map<Object,?> map = (Map<Object, ?>) obj;
<br> return map.get(property);
<br> }
<br>
<br> /** {@inheritDoc} */
<br>- @SuppressWarnings("unchecked")
<br> @Override
<br> public Object tryExecute(final Object obj, Object key) {
<br> if (obj != null && method != null
<br> && objectClass.equals(obj.getClass())
<br> && (key == null || property.getClass().equals(key.getClass()))) {
<br>+ @SuppressWarnings("unchecked") // ctor only allows Map instances - see discover() method
<br> final Map<Object,?> map = (Map<Object, ?>) obj;
<br> return map.get(key);
<br> }
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapSetExecutor.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapSetExecutor.java?rev=885514&r1=885513&r2=885514&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapSetExecutor.java?rev=885514&r1=885513&r2=885514&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapSetExecutor.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/MapSetExecutor.java Mon Nov 30 17:43:42 2009
<br>@@ -47,22 +47,22 @@
<br> }
<br>
<br> /** {@inheritDoc} */
<br>- @SuppressWarnings("unchecked")
<br> @Override
<br> public Object execute(final Object obj, Object value)
<br> throws IllegalAccessException, InvocationTargetException {
<br>+ @SuppressWarnings("unchecked") // ctor only allows Map instances - see discover() method
<br> final Map<Object,Object> map = ((Map<Object, Object>) obj);
<br> map.put(property, value);
<br> return value;
<br> }
<br>
<br> /** {@inheritDoc} */
<br>- @SuppressWarnings("unchecked")
<br> @Override
<br> public Object tryExecute(final Object obj, Object key, Object value) {
<br> if (obj != null && method != null
<br> && objectClass.equals(obj.getClass())
<br> && (key == null || property.getClass().equals(key.getClass()))) {
<br>+ @SuppressWarnings("unchecked") // ctor only allows Map instances - see discover() method
<br> final Map<Object,Object> map = ((Map<Object, Object>) obj);
<br> map.put(key, value);
<br> return value;
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26578499
svn commit: r885510 - /commons/proper/dbcp/trunk/xdocs/changes.xml
2009-11-30T09:28:05Z
2009-11-30T09:28:05Z
psteitz
Author: psteitz
<br>Date: Mon Nov 30 17:28:05 2009
<br>New Revision: 885510
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885510&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885510&view=rev</a><br>Log:
<br>Updated for 1.4 release.
<br><br>Modified:
<br> commons/proper/dbcp/trunk/xdocs/changes.xml
<br><br>Modified: commons/proper/dbcp/trunk/xdocs/changes.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/xdocs/changes.xml?rev=885510&r1=885509&r2=885510&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/xdocs/changes.xml?rev=885510&r1=885509&r2=885510&view=diff</a><br>==============================================================================
<br>--- commons/proper/dbcp/trunk/xdocs/changes.xml (original)
<br>+++ commons/proper/dbcp/trunk/xdocs/changes.xml Mon Nov 30 17:28:05 2009
<br>@@ -38,7 +38,7 @@
<br> <title>Commons DBCP Release Notes</title>
<br> </properties>
<br> <body>
<br>- <release version="1.3" date="TBD" description="This release will include
<br>+ <release version="1.4" date="TBD" description="This release will include
<br> new features as well as bug fixes and instrumentation. Some bug fixes
<br> will change semantics (e.g. connection close will become idempotent).
<br> The minimum JDK level will be increased to 1.4">
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26578418
svn commit: r885509 - /commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java
2009-11-30T09:21:49Z
2009-11-30T09:21:49Z
sebb-3
Author: sebb
<br>Date: Mon Nov 30 17:21:48 2009
<br>New Revision: 885509
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885509&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885509&view=rev</a><br>Log:
<br>Document why cast is safe
<br>Typo in message: iterative => iterator
<br><br>Modified:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java?rev=885509&r1=885508&r2=885509&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java?rev=885509&r1=885508&r2=885509&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/introspection/UberspectImpl.java Mon Nov 30 17:21:48 2009
<br>@@ -65,7 +65,6 @@
<br> /**
<br> * {@inheritDoc}
<br> */
<br>- @SuppressWarnings("unchecked")
<br> public Iterator<?> getIterator(Object obj, DebugInfo info) {
<br> if (obj.getClass().isArray()) {
<br> return new ArrayIterator(obj);
<br>@@ -75,15 +74,17 @@
<br> return ((Map<?,?>) obj).values().iterator();
<br> } else if (obj instanceof Iterator<?>) {
<br> rlog.warn(info.debugString()
<br>- + "The iterative is not resetable; if used more than once, "
<br>+ + "The iterator is not resetable; if used more than once, "
<br> + "this may lead to unexpected results.");
<br>
<br> return ((Iterator<?>) obj);
<br> } else if (obj instanceof Enumeration<?>) {
<br> rlog.warn(info.debugString()
<br>- + "The iterative is not resetable; if used more than once, "
<br>+ + "The iterator is not resetable; if used more than once, "
<br> + "this may lead to unexpected results.");
<br>- return new EnumerationIterator<Object>((Enumeration<Object>) obj);
<br>+ @SuppressWarnings("unchecked") // OK because of instanceof check above
<br>+ final Enumeration<Object> enumObj = (Enumeration<Object>) obj;
<br>+ return new EnumerationIterator<Object>(enumObj);
<br> } else {
<br> // look for an iterator() method to support the JDK5 Iterable
<br> // interface or any user tools/DTOs that want to work in
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26578365
svn commit: r885508 - /commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java
2009-11-30T09:18:19Z
2009-11-30T09:18:19Z
sebb-3
Author: sebb
<br>Date: Mon Nov 30 17:18:19 2009
<br>New Revision: 885508
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885508&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885508&view=rev</a><br>Log:
<br>Unnecessary use of @SuppressWarnings("unchecked")
<br><br>Modified:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java?rev=885508&r1=885507&r2=885508&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java?rev=885508&r1=885507&r2=885508&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngine.java Mon Nov 30 17:18:19 2009
<br>@@ -159,7 +159,6 @@
<br> *
<br> * Current implementation only gives access to ENGINE_SCOPE binding.
<br> */
<br>- @SuppressWarnings("unchecked")
<br> private static class JexlContextWrapper implements JexlContext.Nullable {
<br> /** The engine context. */
<br> private final ScriptContext engineContext;
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26578342
svn commit: r885506 - /commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java
2009-11-30T09:16:37Z
2009-11-30T09:16:37Z
sebb-3
Author: sebb
<br>Date: Mon Nov 30 17:16:36 2009
<br>New Revision: 885506
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885506&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885506&view=rev</a><br>Log:
<br>Document why casts are safe
<br><br>Modified:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java?rev=885506&r1=885505&r2=885506&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java?rev=885506&r1=885505&r2=885506&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlContext.java Mon Nov 30 17:16:36 2009
<br>@@ -75,7 +75,7 @@
<br> * Creates an instance using a provided map as the underlying variable storage.
<br> * @param vars the variables map
<br> */
<br>- @SuppressWarnings("unchecked")
<br>+ @SuppressWarnings("unchecked") // OK to cast Map<?,?> to Map<Object,Object>
<br> public Mapped(Map<?, ?> vars) {
<br> map = (Map<Object,Object>) (vars == null? new HashMap<String,Object>() : vars);
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26578337
svn commit: r885505 - /commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java
2009-11-30T09:16:14Z
2009-11-30T09:16:14Z
sebb-3
Author: sebb
<br>Date: Mon Nov 30 17:16:13 2009
<br>New Revision: 885505
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885505&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885505&view=rev</a><br>Log:
<br>Reduce visibility of "strict" variable (there is a getter)
<br>Document why casts are safe
<br><br>Modified:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java?rev=885505&r1=885504&r2=885505&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java?rev=885505&r1=885504&r2=885505&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlArithmetic.java Mon Nov 30 17:16:13 2009
<br>@@ -51,7 +51,7 @@
<br> /** Long.MIN_VALUE as BigInteger. */
<br> protected static final BigInteger BIGI_LONG_MIN_VALUE = BigInteger.valueOf(Long.MIN_VALUE);
<br> /** Whether this JexlArithmetic instance behaves in strict or lenient mode. */
<br>- protected boolean strict;
<br>+ private boolean strict;
<br>
<br> /**
<br> * Creates a JexlArithmetic.
<br>@@ -535,11 +535,11 @@
<br> String rightString = right.toString();
<br> return leftString.compareTo(rightString) < 0;
<br> } else if (left instanceof Comparable<?>) {
<br>- @SuppressWarnings("unchecked")
<br>+ @SuppressWarnings("unchecked") // OK because of instanceof check above
<br> final Comparable<Object> comparable = (Comparable<Object>) left;
<br> return comparable.compareTo(right) < 0;
<br> } else if (right instanceof Comparable<?>) {
<br>- @SuppressWarnings("unchecked")
<br>+ @SuppressWarnings("unchecked") // OK because of instanceof check above
<br> final Comparable<Object> comparable = (Comparable<Object>) right;
<br> return comparable.compareTo(left) > 0;
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26578310
svn commit: r885503 - in /commons/proper/dbcp/trunk: build-1.3.xml pom-1.3.xml
2009-11-30T09:14:33Z
2009-11-30T09:14:33Z
psteitz
Author: psteitz
<br>Date: Mon Nov 30 17:14:33 2009
<br>New Revision: 885503
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885503&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885503&view=rev</a><br>Log:
<br>Added 1.3 build files.
<br><br>Added:
<br> commons/proper/dbcp/trunk/build-1.3.xml (with props)
<br> commons/proper/dbcp/trunk/pom-1.3.xml (with props)
<br><br>Added: commons/proper/dbcp/trunk/build-1.3.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build-1.3.xml?rev=885503&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build-1.3.xml?rev=885503&view=auto</a><br>==============================================================================
<br>--- commons/proper/dbcp/trunk/build-1.3.xml (added)
<br>+++ commons/proper/dbcp/trunk/build-1.3.xml Mon Nov 30 17:14:33 2009
<br>@@ -0,0 +1,246 @@
<br>+<!--
<br>+/*
<br>+ * Licensed to the Apache Software Foundation (ASF) under one
<br>+ * or more contributor license agreements. See the NOTICE file
<br>+ * distributed with this work for additional information
<br>+ * regarding copyright ownership. The ASF licenses this file
<br>+ * to you under the Apache License, Version 2.0 (the
<br>+ * "License"); you may not use this file except in compliance
<br>+ * with the License. You may obtain a copy of the License at
<br>+ *
<br>+ * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+ *
<br>+ * Unless required by applicable law or agreed to in writing,
<br>+ * software distributed under the License is distributed on an
<br>+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
<br>+ * KIND, either express or implied. See the License for the
<br>+ * specific language governing permissions and limitations
<br>+ * under the License.
<br>+ */
<br>+ -->
<br>+
<br>+<!-- $Id: build.xml 884734 2009-11-27 01:11:31Z niallp $ -->
<br>+<project name="commons-dbcp" default="test" basedir=".">
<br>+
<br>+ <target name="init">
<br>+ <tstamp/>
<br>+
<br>+ <!-- read properties from the build.properties, if any -->
<br>+ <property name="component-propfile" value="${basedir}/build.properties"/>
<br>+ <property file="${component-propfile}"/>
<br>+
<br>+ <!-- read properties from the commons build.properties, if any -->
<br>+ <property name="commons-propfile" value="${basedir}/../build.properties"/>
<br>+ <property file="${commons-propfile}"/>
<br>+
<br>+ <!-- read properties from the ${user.home}/propfile, if any -->
<br>+ <property name="user-propfile" value="${user.home}/build.properties"/>
<br>+ <property file="${user-propfile}"/>
<br>+
<br>+ <property name="commons-pool.jar" value="${basedir}/../pool/dist/commons-pool.jar"/>
<br>+
<br>+ <!-- command line classpath, if any -->
<br>+ <property name="cp" value=""/>
<br>+
<br>+ <!-- now combine the classpaths -->
<br>+ <property name="classpath"
<br>+ value="${cp}:${commons-pool.jar}:${junit.jar}:
<br>+ ${naming-common.jar}:${naming-java.jar}:${commons-logging.jar}:
<br>+ ${xerces.jar}:${jta-spec.jar}:${jta-impl.jar}:
<br>+ ${backport-util-concurrent.jar}:${ejb-spec.jar}"/>
<br>+
<br>+ <property name="name" value="commons-dbcp"/>
<br>+ <property name="title" value="Apache Commons Database Pooling Package"/>
<br>+ <property name="version" value="1.3"/>
<br>+ <property name="package" value="org.apache.commons.dbcp.*"/>
<br>+
<br>+ <property name="build.dir" value="${basedir}/build"/>
<br>+ <property name="build.classes.dir" value="${build.dir}/classes"/>
<br>+ <property name="build.test-classes.dir" value="${build.dir}/test-classes"/>
<br>+ <property name="dist.dir" value="${basedir}/dist"/>
<br>+ <property name="dist.jar" value="${dist.dir}/${name}.jar"/>
<br>+
<br>+ <property name="test.entry" value="org.apache.commons.dbcp.TestAll"/>
<br>+ <property name="test.failonerror" value="true" />
<br>+ <property name="test.runner" value="junit.textui.TestRunner" />
<br>+
<br>+ <property name="javadoc.dir" value="${dist.dir}/docs/api"/>
<br>+ <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2009 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
<br>+ <property name="javadoc.overview" value="${basedir}/src/java/org/apache/commons/dbcp/overview.html"/>
<br>+
<br>+ <property name="javac.optimize" value="false"/>
<br>+ <property name="javac.debug" value="true"/>
<br>+ <property name="javac.deprecation" value="false"/>
<br>+ <property name="javac.source" value="1.4" />
<br>+
<br>+ <available property="jndi.present" classname="javax.naming.Context"/>
<br>+ </target>
<br>+
<br>+ <target name="check_jar">
<br>+ <available file="${file}" property="found"/>
<br>+ <antcall target="check_message"/>
<br>+ </target>
<br>+
<br>+ <target name="check_message" unless="found">
<br>+ <!-- echo could be replaced with fail if required -->
<br>+ <echo message="Could not find ${file}"/>
<br>+ </target>
<br>+
<br>+ <!-- Check that all the dependencies exist -->
<br>+ <target name="check_depends" depends="init">
<br>+ <echo>Checking dependencies</echo>
<br>+ <antcall target="check_jar">
<br>+ <param name="file" value="${commons-pool.jar}"/>
<br>+ </antcall>
<br>+ <antcall target="check_jar">
<br>+ <param name="file" value="${junit.jar}"/>
<br>+ </antcall>
<br>+ <antcall target="check_jar">
<br>+ <param name="file" value="${naming-common.jar}"/>
<br>+ </antcall>
<br>+ <antcall target="check_jar">
<br>+ <param name="file" value="${naming-java.jar}"/>
<br>+ </antcall>
<br>+ <antcall target="check_jar">
<br>+ <param name="file" value="${commons-logging.jar}"/>
<br>+ </antcall>
<br>+ <antcall target="check_jar">
<br>+ <param name="file" value="${xerces.jar}"/>
<br>+ </antcall>
<br>+ <antcall target="check_jar">
<br>+ <param name="file" value="${jta-spec.jar}"/>
<br>+ </antcall>
<br>+ <antcall target="check_jar">
<br>+ <param name="file" value="${jta-impl.jar}"/>
<br>+ </antcall>
<br>+ <antcall target="check_jar">
<br>+ <param name="file" value="${backport-util-concurrent.jar}"/>
<br>+ </antcall>
<br>+ <antcall target="check_jar">
<br>+ <param name="file" value="${ejb-spec.jar}"/>
<br>+ </antcall>
<br>+ </target>
<br>+
<br>+ <!-- ######################################################### -->
<br>+
<br>+ <target name="clean" depends="init" description="removes generated files">
<br>+ <delete dir="${build.dir}"/>
<br>+ <delete dir="${dist.dir}"/>
<br>+ </target>
<br>+
<br>+ <target name="filter-sources">
<br>+ <echo message="Comment out the jdbc4 additional methods."/>
<br>+ <property name="src.dir" value="${basedir}/src"/>
<br>+ <property name="src.java.dir" value="${src.dir}/java"/>
<br>+ <property name="src.test.dir" value="${src.dir}/test"/>
<br>+
<br>+ <replace dir="${src.java.dir}" token="/* JDBC_4_ANT_KEY_BEGIN */" value="/*"/>
<br>+ <replace dir="${src.java.dir}" token="/* JDBC_4_ANT_KEY_END */" value="*/"/>
<br>+
<br>+ <replace dir="${src.test.dir}" token="/* JDBC_4_ANT_KEY_BEGIN */" value="/*"/>
<br>+ <replace dir="${src.test.dir}" token="/* JDBC_4_ANT_KEY_END */" value="*/"/>
<br>+ </target>
<br>+
<br>+ <target name="prepare" depends="init,filter-sources"/>
<br>+
<br>+ <target name="javadoc" depends="prepare" description="generates javadocs">
<br>+ <mkdir dir="${javadoc.dir}"/>
<br>+ <javadoc packagenames="org.*"
<br>+ sourcepath="${src.java.dir}"
<br>+ classpath="${classpath}"
<br>+ destdir="${javadoc.dir}"
<br>+ windowtitle="${title}"
<br>+ doctitle="${title}"
<br>+ bottom="${javadoc.bottom}"
<br>+ overview="${javadoc.overview}"
<br>+ public="true"
<br>+ version="true"
<br>+ author="true"
<br>+ splitindex="false"
<br>+ nodeprecated="true"
<br>+ nodeprecatedlist="true"
<br>+ notree="true"
<br>+ noindex="false"
<br>+ nohelp="true"
<br>+ nonavbar="false"
<br>+ serialwarn="false">
<br>+ <link href="<a href="http://java.sun.com/j2se/1.5.0/docs/api" target="_top" rel="nofollow">http://java.sun.com/j2se/1.5.0/docs/api</a>"/>
<br>+ <link href="<a href="http://commons.apache.org/pool/apidocs" target="_top" rel="nofollow">http://commons.apache.org/pool/apidocs</a>"/>
<br>+ </javadoc>
<br>+ </target>
<br>+
<br>+ <!-- ######################################################### -->
<br>+
<br>+ <target name="compile" depends="check_depends,prepare" description="compiles source files">
<br>+ <mkdir dir="${build.classes.dir}"/>
<br>+ <javac destdir="${build.classes.dir}"
<br>+ srcdir="${src.java.dir}"
<br>+ classpath="${classpath}"
<br>+ debug="${javac.debug}"
<br>+ deprecation="${javac.deprecation}"
<br>+ optimize="${javac.optimize}"
<br>+ source="${javac.source}">
<br>+ <exclude name="org/apache/commons/dbcp/BasicDataSourceFactory.java"
<br>+ unless="jndi.present"/>
<br>+ <exclude name="org/apache/commons/dbcp/datasources/**"
<br>+ unless="jndi.present"/>
<br>+ <exclude name="org/apache/commons/dbcp/cpdsadapter/**"
<br>+ unless="jndi.present"/>
<br>+ </javac>
<br>+ </target>
<br>+
<br>+ <target name="compile-test" depends="compile">
<br>+ <mkdir dir="${build.test-classes.dir}"/>
<br>+ <javac destdir="${build.test-classes.dir}"
<br>+ srcdir="${src.test.dir}"
<br>+ debug="${javac.debug}"
<br>+ deprecation="${javac.deprecation}"
<br>+ optimize="${javac.optimize}"
<br>+ source="${javac.source}">
<br>+ <classpath>
<br>+ <pathelement location="${build.classes.dir}" />
<br>+ <pathelement location="${build.test-classes.dir}" />
<br>+ <pathelement path="${classpath}" />
<br>+ </classpath>
<br>+ </javac>
<br>+ <copy todir="${build.test-classes.dir}" file="${src.test.dir}/testpool.jocl"/>
<br>+ </target>
<br>+
<br>+ <target name="test" depends="compile-test" description="runs (junit) unit tests">
<br>+ <echo message="${classpath}"/>
<br>+ <junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}">
<br>+ <classpath>
<br>+ <pathelement location="${build.classes.dir}" />
<br>+ <pathelement location="${build.test-classes.dir}" />
<br>+ <pathelement path="${classpath}" />
<br>+ </classpath>
<br>+ <test name="${test.entry}"/>
<br>+ </junit>
<br>+ </target>
<br>+
<br>+ <target name="build-jar" depends="compile">
<br>+ <mkdir dir="${dist.dir}"/>
<br>+ <jar jarfile="${dist.jar}">
<br>+ <fileset dir="${build.classes.dir}"/>
<br>+ <metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/>
<br>+ <manifest>
<br>+ <attribute name="Built-By" value="${user.name}"/>
<br>+ <attribute name="Package" value="${package}"/>
<br>+ <attribute name="Extension-Name" value="${name}"/>
<br>+ <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
<br>+ <attribute name="Specification-Title" value="${title}"/>
<br>+ <attribute name="Implementation-Version" value="${version}"/>
<br>+ <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
<br>+ </manifest>
<br>+ </jar>
<br>+ </target>
<br>+
<br>+ <target name="build" depends="clean,build-jar,javadoc">
<br>+ <copy todir="${dist.dir}" file="${basedir}/LICENSE.txt"/>
<br>+ <copy todir="${dist.dir}" file="${basedir}/NOTICE.txt"/>
<br>+ <copy todir="${dist.dir}" file="${basedir}/README.txt"/>
<br>+ </target>
<br>+
<br>+ <target name="dist" depends="build" description="gump target"/>
<br>+
<br>+</project>
<br><br>Propchange: commons/proper/dbcp/trunk/build-1.3.xml
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: commons/proper/dbcp/trunk/build-1.3.xml
<br>------------------------------------------------------------------------------
<br> svn:keywords = Date Revision
<br><br>Propchange: commons/proper/dbcp/trunk/build-1.3.xml
<br>------------------------------------------------------------------------------
<br> svn:mime-type = text/xml
<br><br>Added: commons/proper/dbcp/trunk/pom-1.3.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom-1.3.xml?rev=885503&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom-1.3.xml?rev=885503&view=auto</a><br>==============================================================================
<br>--- commons/proper/dbcp/trunk/pom-1.3.xml (added)
<br>+++ commons/proper/dbcp/trunk/pom-1.3.xml Mon Nov 30 17:14:33 2009
<br>@@ -0,0 +1,387 @@
<br>+<?xml version="1.0"?>
<br>+<!--
<br>+ Licensed to the Apache Software Foundation (ASF) under one or more
<br>+ contributor license agreements. See the NOTICE file distributed with
<br>+ this work for additional information regarding copyright ownership.
<br>+ The ASF licenses this file to You under the Apache License, Version 2.0
<br>+ (the "License"); you may not use this file except in compliance with
<br>+ the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+ Unless required by applicable law or agreed to in writing, software
<br>+ distributed under the License is distributed on an "AS IS" BASIS,
<br>+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+ See the License for the specific language governing permissions and
<br>+ limitations under the License.
<br>+-->
<br>+<project
<br>+ xmlns="<a href="http://maven.apache.org/POM/4.0.0" target="_top" rel="nofollow">http://maven.apache.org/POM/4.0.0</a>"
<br>+ xmlns:xsi="<a href="http://www.w3.org/2001/XMLSchema-instance" target="_top" rel="nofollow">http://www.w3.org/2001/XMLSchema-instance</a>"
<br>+ xsi:schemaLocation="<a href="http://maven.apache.org/POM/4.0.0" target="_top" rel="nofollow">http://maven.apache.org/POM/4.0.0</a> <a href="http://maven.apache.org/maven-v4_0_0.xsd" target="_top" rel="nofollow">http://maven.apache.org/maven-v4_0_0.xsd</a>">
<br>+ <parent>
<br>+ <groupId>org.apache.commons</groupId>
<br>+ <artifactId>commons-parent</artifactId>
<br>+ <version>12</version>
<br>+ </parent>
<br>+ <modelVersion>4.0.0</modelVersion>
<br>+ <groupId>commons-dbcp</groupId>
<br>+ <artifactId>commons-dbcp</artifactId>
<br>+ <version>1.3</version>
<br>+ <name>Commons DBCP</name>
<br>+
<br>+ <inceptionYear>2001</inceptionYear>
<br>+ <description>Commons Database Connection Pooling</description>
<br>+ <url><a href="http://commons.apache.org/dbcp/" target="_top" rel="nofollow">http://commons.apache.org/dbcp/</a></url>
<br>+
<br>+ <distributionManagement>
<br>+ <site>
<br>+ <id>people.apache.org</id>
<br>+ <name>Commons DBCP</name>
<br>+ <url>scp://people.apache.org/www/commons.apache.org/dbcp</url>
<br>+ </site>
<br>+ </distributionManagement>
<br>+
<br>+ <issueManagement>
<br>+ <system>jira</system>
<br>+ <url><a href="http://issues.apache.org/jira/browse/DBCP" target="_top" rel="nofollow">http://issues.apache.org/jira/browse/DBCP</a></url>
<br>+ </issueManagement>
<br>+
<br>+ <scm>
<br>+ <connection>scm:svn:<a href="http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk" target="_top" rel="nofollow">http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk</a></connection>
<br>+ <developerConnection>scm:svn:<a href="https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_BRANCH" target="_top" rel="nofollow">https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_BRANCH</a></developerConnection>
<br>+ <url><a href="http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH</a></url>
<br>+ </scm>
<br>+
<br>+ <developers>
<br>+ <developer>
<br>+ <name>Morgan Delagrange</name>
<br>+ <id>morgand</id>
<br>+ <email></email>
<br>+ <organization></organization>
<br>+ </developer>
<br>+ <developer>
<br>+ <name>Geir Magnusson</name>
<br>+ <id>geirm</id>
<br>+ <email></email>
<br>+ <organization></organization>
<br>+ </developer>
<br>+ <developer>
<br>+ <name>Craig McClanahan</name>
<br>+ <id>craigmcc</id>
<br>+ <email></email>
<br>+ <organization></organization>
<br>+ </developer>
<br>+ <developer>
<br>+ <name>John McNally</name>
<br>+ <id>jmcnally</id>
<br>+ <email></email>
<br>+ <organization></organization>
<br>+ </developer>
<br>+ <developer>
<br>+ <name>Martin Poeschl</name>
<br>+ <id>mpoeschl</id>
<br>+ <email><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26578310&i=0" target="_top" rel="nofollow">mpoeschl@...</a></email>
<br>+ <organization>tucana.at</organization>
<br>+ </developer>
<br>+ <developer>
<br>+ <name>Rodney Waldhoff</name>
<br>+ <id>rwaldhoff</id>
<br>+ <email></email>
<br>+ <organization></organization>
<br>+ </developer>
<br>+ <developer>
<br>+ <name>David Weinrich</name>
<br>+ <id>dweinr1</id>
<br>+ <email></email>
<br>+ <organization></organization>
<br>+ </developer>
<br>+ <developer>
<br>+ <name>Dirk Verbeeck</name>
<br>+ <id>dirkv</id>
<br>+ <email></email>
<br>+ <organization></organization>
<br>+ </developer>
<br>+ <developer>
<br>+ <name>Yoav Shapira</name>
<br>+ <id>yoavs</id>
<br>+ <email><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26578310&i=1" target="_top" rel="nofollow">yoavs@...</a></email>
<br>+ <organization>Apache Software Foundation</organization>
<br>+ </developer>
<br>+ <developer>
<br>+ <name>Phil Steitz</name>
<br>+ <id>psteitz</id>
<br>+ <email></email>
<br>+ <organization></organization>
<br>+ </developer>
<br>+ <developer>
<br>+ <name>Jörg Schaible</name>
<br>+ <id>joehni</id>
<br>+ <email><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26578310&i=2" target="_top" rel="nofollow">joerg.schaible@...</a></email>
<br>+ <organization></organization>
<br>+ <timezone>+1</timezone>
<br>+ </developer>
<br>+ <developer>
<br>+ <name>Mark Thomas</name>
<br>+ <id>markt</id>
<br>+ <email><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26578310&i=3" target="_top" rel="nofollow">markt@...</a></email>
<br>+ <organization>Apache Software Foundation</organization>
<br>+ </developer>
<br>+ </developers>
<br>+ <contributors>
<br>+ <contributor>
<br>+ <name>Todd Carmichael</name>
<br>+ <email><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26578310&i=4" target="_top" rel="nofollow">toddc@...</a></email>
<br>+ </contributor>
<br>+ <contributor>
<br>+ <name>Wayne Woodfield</name>
<br>+ </contributor>
<br>+ <contributor>
<br>+ <name>Dain Sundstrom</name>
<br>+ <email><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26578310&i=5" target="_top" rel="nofollow">dain@...</a></email>
<br>+ </contributor>
<br>+ <contributor>
<br>+ <name>Philippe Mouawad</name>
<br>+ </contributor>
<br>+ </contributors>
<br>+
<br>+ <dependencies>
<br>+ <dependency>
<br>+ <groupId>commons-pool</groupId>
<br>+ <artifactId>commons-pool</artifactId>
<br>+ <version>1.5.4</version>
<br>+ </dependency>
<br>+
<br>+ <dependency>
<br>+ <groupId>junit</groupId>
<br>+ <artifactId>junit</artifactId>
<br>+ <version>3.8.2</version>
<br>+ <scope>test</scope>
<br>+ </dependency>
<br>+
<br>+ <!-- For managed connections -->
<br>+ <dependency>
<br>+ <groupId>org.apache.geronimo.specs</groupId>
<br>+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<br>+ <version>1.1.1</version>
<br>+ <optional>true</optional>
<br>+ </dependency>
<br>+
<br>+ <!-- tomcat naming jars for jndi reference tests -->
<br>+ <dependency>
<br>+ <groupId>tomcat</groupId>
<br>+ <artifactId>naming-common</artifactId>
<br>+ <version>5.0.28</version>
<br>+ <scope>test</scope>
<br>+ </dependency>
<br>+
<br>+ <dependency>
<br>+ <groupId>tomcat</groupId>
<br>+ <artifactId>naming-java</artifactId>
<br>+ <version>5.0.28</version>
<br>+ <scope>test</scope>
<br>+ </dependency>
<br>+
<br>+ <!-- dragged in by tomcat-naming jars - only for jndi tests -->
<br>+ <dependency>
<br>+ <groupId>commons-logging</groupId>
<br>+ <artifactId>commons-logging</artifactId>
<br>+ <version>1.1.1</version>
<br>+ <scope>test</scope>
<br>+ </dependency>
<br>+
<br>+ <!-- for testing of managed connections -->
<br>+ <dependency>
<br>+ <groupId>org.apache.geronimo.modules</groupId>
<br>+ <artifactId>geronimo-transaction</artifactId>
<br>+ <version>1.2-beta</version>
<br>+ <scope>test</scope>
<br>+ </dependency>
<br>+
<br>+ <!-- required under jdk 1.4 so jocl can have a sax parser -->
<br>+ <dependency>
<br>+ <groupId>xml-apis</groupId>
<br>+ <artifactId>xml-apis</artifactId>
<br>+ <version>2.0.2</version>
<br>+ <scope>test</scope>
<br>+ </dependency>
<br>+ <dependency>
<br>+ <groupId>xerces</groupId>
<br>+ <artifactId>xerces</artifactId>
<br>+ <version>2.4.0</version>
<br>+ <scope>test</scope>
<br>+ </dependency>
<br>+ </dependencies>
<br>+
<br>+ <properties>
<br>+ <!-- Target Java versions are actually 1.4, 1.5 and 1.6 -->
<br>+ <maven.compile.source>1.4</maven.compile.source>
<br>+ <maven.compile.target>1.4</maven.compile.target>
<br>+ <commons.componentid>dbcp</commons.componentid>
<br>+ <commons.release.version>1.3</commons.release.version>
<br>+ <commons.binary.suffix></commons.binary.suffix>
<br>+ <commons.jira.id>DBCP</commons.jira.id>
<br>+ <commons.jira.pid>12310469</commons.jira.pid>
<br>+ </properties>
<br>+
<br>+ <build>
<br>+ <sourceDirectory>src/java</sourceDirectory>
<br>+ <testSourceDirectory>src/test</testSourceDirectory>
<br>+ <resources>
<br>+ <resource>
<br>+ <directory>src/test</directory>
<br>+ <includes>
<br>+ <include>testpool.jocl</include>
<br>+ </includes>
<br>+ </resource>
<br>+ <resource>
<br>+ <directory>.</directory>
<br>+ <targetPath>META-INF</targetPath>
<br>+ <includes>
<br>+ <include>NOTICE.txt</include>
<br>+ <include>LICENSE.txt</include>
<br>+ </includes>
<br>+ </resource>
<br>+ </resources>
<br>+ <testResources>
<br>+ <testResource>
<br>+ <directory>${basedir}/src/test</directory>
<br>+ <includes>
<br>+ <include>testpool.jocl</include>
<br>+ </includes>
<br>+ </testResource>
<br>+ </testResources>
<br>+ <plugins>
<br>+ <!-- Specify cobertura version for "cobertura:cobertura" goal -->
<br>+ <plugin>
<br>+ <groupId>org.codehaus.mojo</groupId>
<br>+ <artifactId>cobertura-maven-plugin</artifactId>
<br>+ <version>2.3</version>
<br>+ </plugin>
<br>+ <plugin>
<br>+ <groupId>org.apache.maven.plugins</groupId>
<br>+ <artifactId>maven-surefire-plugin</artifactId>
<br>+ <configuration>
<br>+ <reportFormat>plain</reportFormat>
<br>+ <includes>
<br>+ <include>org/apache/commons/dbcp/TestAbandonedObjectPool.java</include>
<br>+ <include>org/apache/commons/jocl/TestJOCLContentHandler.java</include>
<br>+ <include>org/apache/commons/dbcp/TestDelegatingConnection.java</include>
<br>+ <include>org/apache/commons/dbcp/TestPoolableConnection.java</include>
<br>+ <include>org/apache/commons/dbcp/TestDelegatingPreparedStatement.java</include>
<br>+ <include>org/apache/commons/dbcp/TestDelegatingStatement.java</include>
<br>+ <include>org/apache/commons/dbcp/TestJOCLed.java</include>
<br>+ <include>org/apache/commons/dbcp/TestManual.java</include>
<br>+
<br>+ <include>org/apache/commons/dbcp/TestBasicDataSourceFactory.java</include>
<br>+ <include>org/apache/commons/dbcp/TestBasicDataSource.java</include>
<br>+ <include>org/apache/commons/dbcp/TestAbandonedBasicDataSource.java</include>
<br>+ <include>org/apache/commons/dbcp/TestPStmtPooling.java</include>
<br>+ <include>org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java</include>
<br>+ <include>org/apache/commons/dbcp/TestPoolingDataSource.java</include>
<br>+ <include>org/apache/commons/dbcp/TestJndi.java</include>
<br>+
<br>+ <include>org/apache/commons/dbcp/cpdsadapter/TestDriverAdapterCPDS.java</include>
<br>+
<br>+ <include>org/apache/commons/dbcp/datasources/TestFactory.java</include>
<br>+ <include>org/apache/commons/dbcp/datasources/TestCPDSConnectionFactory.java</include>
<br>+ <include>org/apache/commons/dbcp/datasources/TestKeyedCPDSConnectionFactory.java</include>
<br>+ <include>org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java</include>
<br>+ <include>org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java</include>
<br>+ <include>org/apache/commons/dbcp/datasources/TestInstanceKeyDataSource.java</include>
<br>+
<br>+ <include>org/apache/commons/dbcp/managed/TestBasicManagedDataSource.java</include>
<br>+ <include>org/apache/commons/dbcp/managed/TestManagedDataSource.java</include>
<br>+ <include>org/apache/commons/dbcp/managed/TestManagedDataSourceInTx.java</include>
<br>+ </includes>
<br>+ </configuration>
<br>+ </plugin>
<br>+ <plugin>
<br>+ <artifactId>maven-assembly-plugin</artifactId>
<br>+ <configuration>
<br>+ <descriptors>
<br>+ <descriptor>src/assembly/bin.xml</descriptor>
<br>+ <descriptor>src/assembly/src.xml</descriptor>
<br>+ </descriptors>
<br>+ <tarLongFileMode>gnu</tarLongFileMode>
<br>+ </configuration>
<br>+ </plugin>
<br>+ </plugins>
<br>+ </build>
<br>+ <reporting>
<br>+ <plugins>
<br>+ <plugin>
<br>+ <groupId>org.codehaus.mojo</groupId>
<br>+ <artifactId>findbugs-maven-plugin</artifactId>
<br>+ <version>2.1</version>
<br>+ <configuration>
<br>+ <threshold>Normal</threshold>
<br>+ <effort>Default</effort>
<br>+ <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile>
<br>+ </configuration>
<br>+ </plugin>
<br>+ <plugin>
<br>+ <groupId>org.codehaus.mojo</groupId>
<br>+ <artifactId>cobertura-maven-plugin</artifactId>
<br>+ <version>2.3</version>
<br>+ </plugin>
<br>+ <plugin>
<br>+ <groupId>org.apache.maven.plugins</groupId>
<br>+ <artifactId>maven-javadoc-plugin</artifactId>
<br>+ <version>2.4</version>
<br>+ <configuration>
<br>+ <links>
<br>+ <link><a href="http://java.sun.com/j2se/1.5.0/docs/api" target="_top" rel="nofollow">http://java.sun.com/j2se/1.5.0/docs/api</a></link>
<br>+ <link><a href="http://commons.apache.org/pool/api-1.5" target="_top" rel="nofollow">http://commons.apache.org/pool/api-1.5</a></link>
<br>+ <link><a href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api" target="_top" rel="nofollow">http://java.sun.com/j2ee/sdk_1.3/techdocs/api</a></link>
<br>+ </links>
<br>+ </configuration>
<br>+ </plugin>
<br>+ <plugin>
<br>+ <groupId>org.apache.maven.plugins</groupId>
<br>+ <artifactId>maven-changes-plugin</artifactId>
<br>+ <version>2.0</version>
<br>+ <configuration>
<br>+ <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
<br>+ <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
<br>+ </configuration>
<br>+ <reportSets>
<br>+ <reportSet>
<br>+ <reports>
<br>+ <report>changes-report</report>
<br>+ </reports>
<br>+ </reportSet>
<br>+ </reportSets>
<br>+ </plugin>
<br>+ <plugin>
<br>+ <groupId>org.apache.maven.plugins</groupId>
<br>+ <artifactId>maven-checkstyle-plugin</artifactId>
<br>+ <version>2.1</version>
<br>+ <configuration>
<br>+ <configLocation>${basedir}/checkstyle.xml</configLocation>
<br>+ <enableRulesSummary>false</enableRulesSummary>
<br>+ </configuration>
<br>+ </plugin>
<br>+ <plugin>
<br>+ <groupId>org.apache.maven.plugins</groupId>
<br>+ <artifactId>maven-pmd-plugin</artifactId>
<br>+ <version>2.4</version>
<br>+ <configuration>
<br>+ <rulesets>
<br>+ <ruleset>checkstyle.xml</ruleset>
<br>+ </rulesets>
<br>+ <targetJdk>${maven.compile.target}</targetJdk>
<br>+ </configuration>
<br>+ </plugin>
<br>+ <plugin>
<br>+ <groupId>org.codehaus.mojo</groupId>
<br>+ <artifactId>clirr-maven-plugin</artifactId>
<br>+ <version>2.2.2</version>
<br>+ <configuration>
<br>+ <comparisonVersion>1.2.2</comparisonVersion>
<br>+ <minSeverity>info</minSeverity>
<br>+ </configuration>
<br>+ </plugin>
<br>+ </plugins>
<br>+ </reporting>
<br>+</project>
<br><br>Propchange: commons/proper/dbcp/trunk/pom-1.3.xml
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: commons/proper/dbcp/trunk/pom-1.3.xml
<br>------------------------------------------------------------------------------
<br> svn:keywords = Date Revision
<br><br>Propchange: commons/proper/dbcp/trunk/pom-1.3.xml
<br>------------------------------------------------------------------------------
<br> svn:mime-type = text/xml
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26578297
svn commit: r885502 - /commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java
2009-11-30T09:14:00Z
2009-11-30T09:14:00Z
sebb-3
Author: sebb
<br>Date: Mon Nov 30 17:14:00 2009
<br>New Revision: 885502
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885502&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885502&view=rev</a><br>Log:
<br>Improve type-safety by using parameterized emptySet() method instead of EMPTYSET
<br><br>Modified:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java?rev=885502&r1=885501&r2=885502&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java?rev=885502&r1=885501&r2=885502&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/JexlEngine.java Mon Nov 30 17:14:00 2009
<br>@@ -692,10 +692,9 @@
<br> * Produces the cache entry set.
<br> * @return the cache entry set
<br> */
<br>- @SuppressWarnings("unchecked")
<br> Set<Entry<K, V>> entrySet() {
<br> Map<K, V> map = ref != null ? ref.get() : null;
<br>- return map != null ? map.entrySet() : (Set<Entry<K, V>>) Collections.EMPTY_SET;
<br>+ return map != null ? map.entrySet() : Collections.<Entry<K, V>>emptySet();
<br> }
<br>
<br> /**
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26578290
svn commit: r885501 - /commons/proper/dbcp/trunk/pom.xml
2009-11-30T09:13:45Z
2009-11-30T09:13:45Z
psteitz
Author: psteitz
<br>Date: Mon Nov 30 17:13:44 2009
<br>New Revision: 885501
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885501&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885501&view=rev</a><br>Log:
<br>Prepare for 1.4 release.
<br><br>Modified:
<br> commons/proper/dbcp/trunk/pom.xml
<br><br>Modified: commons/proper/dbcp/trunk/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=885501&r1=885500&r2=885501&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=885501&r1=885500&r2=885501&view=diff</a><br>==============================================================================
<br>--- commons/proper/dbcp/trunk/pom.xml (original)
<br>+++ commons/proper/dbcp/trunk/pom.xml Mon Nov 30 17:13:44 2009
<br>@@ -27,7 +27,7 @@
<br> <modelVersion>4.0.0</modelVersion>
<br> <groupId>commons-dbcp</groupId>
<br> <artifactId>commons-dbcp</artifactId>
<br>- <version>1.3-SNAPSHOT</version>
<br>+ <version>1.4</version>
<br> <name>Commons DBCP</name>
<br>
<br> <inceptionYear>2001</inceptionYear>
<br>@@ -219,7 +219,7 @@
<br> <maven.compile.source>1.6</maven.compile.source>
<br> <maven.compile.target>1.6</maven.compile.target>
<br> <commons.componentid>dbcp</commons.componentid>
<br>- <commons.release.version>1.2.2</commons.release.version>
<br>+ <commons.release.version>1.4</commons.release.version>
<br> <commons.binary.suffix></commons.binary.suffix>
<br> <commons.jira.id>DBCP</commons.jira.id>
<br> <commons.jira.pid>12310469</commons.jira.pid>
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26577909
svn commit: r885490 - in /commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2: ArrayAccessTest.java CacheTest.java UnifiedJEXLTest.java util/introspection/MethodKeyTest.java
2009-11-30T08:50:24Z
2009-11-30T08:50:24Z
sebb-3
Author: sebb
<br>Date: Mon Nov 30 16:50:24 2009
<br>New Revision: 885490
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885490&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885490&view=rev</a><br>Log:
<br>Reduce visibility and mutability where possible
<br><br>Modified:
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
<br> commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java?rev=885490&r1=885489&r2=885490&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java?rev=885490&r1=885489&r2=885490&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ArrayAccessTest.java Mon Nov 30 16:50:24 2009
<br>@@ -33,11 +33,14 @@
<br>
<br> private Asserter asserter;
<br>
<br>- protected static final String GET_METHOD_STRING = "GetMethod string";
<br>- protected static final String[] GET_METHOD_ARRAY =
<br>+ private static final String GET_METHOD_STRING = "GetMethod string";
<br>+
<br>+ // Needs to be accessible by Foo.class
<br>+ static final String[] GET_METHOD_ARRAY =
<br> new String[] { "One", "Two", "Three" };
<br>
<br>- protected static final String[][] GET_METHOD_ARRAY2 =
<br>+ // Needs to be accessible by Foo.class
<br>+ static final String[][] GET_METHOD_ARRAY2 =
<br> new String[][] { {"One", "Two", "Three"},{"Four", "Five", "Six"} };
<br>
<br> @Override
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java?rev=885490&r1=885489&r2=885490&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java?rev=885490&r1=885489&r2=885490&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/CacheTest.java Mon Nov 30 16:50:24 2009
<br>@@ -26,16 +26,16 @@
<br> public CacheTest(String testName) {
<br> super(testName);
<br> }
<br>- static JexlEngine jexl = new JexlEngine();
<br>+ private static final JexlEngine jexl = new JexlEngine();
<br>
<br> static {
<br> jexl.setCache(512);
<br> jexl.setLenient(false);
<br> jexl.setSilent(false);
<br> }
<br>- static int LOOPS = 1024;
<br>+ private static final int LOOPS = 1024;
<br> // A pseudo random mix of accessors
<br>- static int[] MIX = {
<br>+ private static final int[] MIX = {
<br> 0, 0, 3, 3, 4, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 1, 1, 1, 2, 2, 2,
<br> 3, 3, 3, 4, 4, 4, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 2, 2, 3, 3, 0
<br> };
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java?rev=885490&r1=885489&r2=885490&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java?rev=885490&r1=885489&r2=885490&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java Mon Nov 30 16:50:24 2009
<br>@@ -29,10 +29,10 @@
<br> ENGINE.setSilent(false);
<br> ENGINE.setCache(128);
<br> }
<br>- static UnifiedJEXL EL = new UnifiedJEXL(ENGINE);
<br>- static Log LOG = LogFactory.getLog(UnifiedJEXL.class);
<br>- JexlContext context = null;
<br>- Map<String,Object> vars =null;
<br>+ private static final UnifiedJEXL EL = new UnifiedJEXL(ENGINE);
<br>+ private static final Log LOG = LogFactory.getLog(UnifiedJEXL.class);
<br>+ private JexlContext context = null;
<br>+ private Map<String,Object> vars =null;
<br>
<br> @Override
<br> public void setUp() throws Exception {
<br><br>Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java?rev=885490&r1=885489&r2=885490&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java?rev=885490&r1=885489&r2=885490&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java (original)
<br>+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/util/introspection/MethodKeyTest.java Mon Nov 30 16:50:24 2009
<br>@@ -21,7 +21,7 @@
<br> */
<br> public class MethodKeyTest extends TestCase {
<br> // A set of classes (most of them primitives)
<br>- static Class<?>[] PRIMS = {
<br>+ private static final Class<?>[] PRIMS = {
<br> Boolean.TYPE,
<br> Byte.TYPE,
<br> Character.TYPE,
<br>@@ -35,7 +35,7 @@
<br> };
<br>
<br> // A set of instances corresponding to the classes
<br>- static Object[] ARGS = {
<br>+ private static final Object[] ARGS = {
<br> new Boolean(true),
<br> new Byte((byte) 1),
<br> new Character('2'),
<br>@@ -49,7 +49,7 @@
<br> };
<br>
<br> // A set of (pseudo) method names
<br>- static String[] METHODS = {
<br>+ private static final String[] METHODS = {
<br> "plus",
<br> "minus",
<br> "execute",
<br>@@ -75,14 +75,14 @@
<br> };
<br>
<br> /** from key to string */
<br>- static java.util.Map< MethodKey, String> byKey;
<br>+ private static final java.util.Map< MethodKey, String> byKey;
<br> /** form string to key */
<br>- static java.util.Map<String,MethodKey> byString;
<br>+ private static final java.util.Map<String,MethodKey> byString;
<br> /** the list of keys we generated & test against */
<br>- static MethodKey[] keyList;
<br>+ private static final MethodKey[] keyList;
<br>
<br> /** Creates & inserts a key into the byKey & byString map */
<br>- static void setUpKey(String name, Class<?>[] parms) {
<br>+ private static void setUpKey(String name, Class<?>[] parms) {
<br> MethodKey key = new MethodKey(name, parms);
<br> String str = key.toString();
<br> byKey.put(key, str);
<br>@@ -162,7 +162,7 @@
<br>
<br> }
<br>
<br>- static final int LOOP = 3;//00;
<br>+ private static final int LOOP = 3;//00;
<br>
<br> public void testPerfKey() throws Exception {
<br> for(int l = 0; l < LOOP; ++l)
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26577730
svn commit: r885485 - /commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java
2009-11-30T08:39:19Z
2009-11-30T08:39:19Z
sebb-3
Author: sebb
<br>Date: Mon Nov 30 16:39:19 2009
<br>New Revision: 885485
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885485&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885485&view=rev</a><br>Log:
<br>Use IODH idiom instead of volatile and double-checked locking
<br><br>Modified:
<br> commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java
<br><br>Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java?rev=885485&r1=885484&r2=885485&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java?rev=885485&r1=885484&r2=885485&view=diff</a><br>==============================================================================
<br>--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java (original)
<br>+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/util/Introspector.java Mon Nov 30 16:39:19 2009
<br>@@ -33,8 +33,12 @@
<br> * @since 1.0
<br> */
<br> public class Introspector {
<br>- /** The default uberspector that handles all introspection patterns. */
<br>- private static volatile Uberspect uberSpect;
<br>+
<br>+ private static class UberspectHolder{// Implements init on demand holder idiom
<br>+ /** The default uberspector that handles all introspection patterns. */
<br>+ private static final Uberspect UBERSPECT = new UberspectImpl(LogFactory.getLog(Introspector.class));
<br>+ }
<br>+
<br> /** The logger to use for all warnings & errors. */
<br> protected final Log rlog;
<br> /** The (low level) introspector to use for introspection services. */
<br>@@ -105,20 +109,9 @@
<br> * instead of the default one.</p>
<br> * @return Uberspect the default uberspector instance.
<br> */
<br>- // CSOFF: DoubleCheckedLocking
<br> public static Uberspect getUberspect() {
<br>- // uses a double-locking pattern
<br>- if (uberSpect == null) {
<br>- synchronized (Uberspect.class) {
<br>- if (uberSpect == null) {
<br>- Log logger = LogFactory.getLog(Introspector.class);
<br>- uberSpect = new UberspectImpl(logger);
<br>- }
<br>- }
<br>- }
<br>- return uberSpect;
<br>+ return UberspectHolder.UBERSPECT;
<br> }
<br>- // CSON: DoubleCheckedLocking
<br>
<br> /**
<br> * Creates a new instance of Uberspect.
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26566603
svn commit: r885279 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SingularValueDecompositionImpl.java
2009-11-29T13:53:37Z
2009-11-29T13:53:37Z
luc-17
Author: luc
<br>Date: Sun Nov 29 21:53:36 2009
<br>New Revision: 885279
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885279&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885279&view=rev</a><br>Log:
<br>Prevent NaN to occur for singular matrices
<br>Numerical inaccuracies in the underlying eigendecomposition could induce
<br>very small negative eigenvalues, so the square root produced NaNs. The
<br>eigenvalues really cannot be negative, so it is safe to replace the negative
<br>ones by 0.
<br>There are remaining problems with singular matrices:
<br> - the singular vectors also contain NaNs
<br> - the solver does not really work in least square sense and
<br> complain about singular matrices
<br>JIRA: MATH-320
<br><br>Modified:
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SingularValueDecompositionImpl.java
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SingularValueDecompositionImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SingularValueDecompositionImpl.java?rev=885279&r1=885278&r2=885279&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SingularValueDecompositionImpl.java?rev=885279&r1=885278&r2=885279&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SingularValueDecompositionImpl.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SingularValueDecompositionImpl.java Sun Nov 29 21:53:36 2009
<br>@@ -115,7 +115,8 @@
<br> MathUtils.SAFE_MIN);
<br> singularValues = eigenDecomposition.getRealEigenvalues();
<br> for (int i = 0; i < singularValues.length; ++i) {
<br>- singularValues[i] = Math.sqrt(singularValues[i]);
<br>+ final double si = singularValues[i];
<br>+ singularValues[i] = (si < 0) ? 0.0 : Math.sqrt(si);
<br> }
<br>
<br> }
<br>@@ -133,14 +134,15 @@
<br> double[] ei1 = eData[0];
<br> iData[0] = ei1;
<br> for (int i = 0; i < n - 1; ++i) {
<br>- // compute Bt.E.S^(-1) where E is the eigenvectors matrix
<br>+ // compute B.E.S^(-1) where E is the eigenvectors matrix
<br> // we reuse the array from matrix E to store the result
<br>+ final double mi = mainBidiagonal[i];
<br>+ final double si = secondaryBidiagonal[i];
<br> final double[] ei0 = ei1;
<br> ei1 = eData[i + 1];
<br> iData[i + 1] = ei1;
<br> for (int j = 0; j < n; ++j) {
<br>- ei0[j] = (mainBidiagonal[i] * ei0[j] +
<br>- secondaryBidiagonal[i] * ei1[j]) / singularValues[j];
<br>+ ei0[j] = (mi * ei0[j] + si * ei1[j]) / singularValues[j];
<br> }
<br> }
<br> // last row
<br>@@ -215,12 +217,13 @@
<br> for (int i = 0; i < m - 1; ++i) {
<br> // compute Bt.E.S^(-1) where E is the eigenvectors matrix
<br> // we reuse the array from matrix E to store the result
<br>+ final double mi = mainBidiagonal[i];
<br>+ final double si = secondaryBidiagonal[i];
<br> final double[] ei0 = ei1;
<br> ei1 = eData[i + 1];
<br> iData[i + 1] = ei1;
<br> for (int j = 0; j < m; ++j) {
<br>- ei0[j] = (mainBidiagonal[i] * ei0[j] +
<br>- secondaryBidiagonal[i] * ei1[j]) / singularValues[j];
<br>+ ei0[j] = (mi * ei0[j] + si * ei1[j]) / singularValues[j];
<br> }
<br> }
<br> // last row
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26566546
svn commit: r885278 - in /commons/proper/math/trunk/src/main/java/org/apache/commons/math: ./ analysis/polynomials/ analysis/solvers/ distribution/ fraction/ linear/ optimization/direct/ optimization/linear/ stat/descriptive/ stat/inference/ transform/...
2009-11-29T13:47:52Z
2009-11-29T13:47:52Z
luc-17
Author: luc
<br>Date: Sun Nov 29 21:47:51 2009
<br>New Revision: 885278
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885278&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885278&view=rev</a><br>Log:
<br>replaced duplicated strings by a single static string in many classes
<br>this will later allow enabling the MultipleStringLiterals rule in checkstyle
<br>(there are many other duplicated strings, so this cannot be enabled yet, I'll
<br>do another pass on it later on)
<br><br>Modified:
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/MessagesResources_fr.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/BigFraction.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/Fraction.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/linear/SimplexTableau.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToDoubleHashMap.java
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java Sun Nov 29 21:47:51 2009
<br>@@ -31,6 +31,10 @@
<br> /** Serializable version identifier. */
<br> private static final long serialVersionUID = -4305020489115478365L;
<br>
<br>+ /** Message for failed evaluation. */
<br>+ private static final String FAILED_EVALUATION_MESSAGE =
<br>+ "evaluation failed for argument = {0}";
<br>+
<br> /** Argument causing function evaluation failure */
<br> private double[] argument;
<br>
<br>@@ -41,7 +45,7 @@
<br> * @param argument the failing function argument
<br> */
<br> public FunctionEvaluationException(double argument) {
<br>- super("evaluation failed for argument = {0}", argument);
<br>+ super(FAILED_EVALUATION_MESSAGE, argument);
<br> this.argument = new double[] { argument };
<br> }
<br>
<br>@@ -53,7 +57,7 @@
<br> * @since 2.0
<br> */
<br> public FunctionEvaluationException(double[] argument) {
<br>- super("evaluation failed for argument = {0}", new ArrayRealVector(argument));
<br>+ super(FAILED_EVALUATION_MESSAGE, new ArrayRealVector(argument));
<br> this.argument = argument.clone();
<br> }
<br>
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/MessagesResources_fr.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/MessagesResources_fr.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/MessagesResources_fr.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/MessagesResources_fr.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/MessagesResources_fr.java Sun Nov 29 21:47:51 2009
<br>@@ -43,10 +43,8 @@
<br> { "cannot raise an integral value to a negative power ({0}^{1})",
<br> "impossible d''\u00e9lever une valeur enti\u00e8re " +
<br> "\u00e0 une puissance n\u00e9gative ({0}^{1})" },
<br>- { "invalid rounding method {0}, valid methods: {1} ({2}), {3} ({4})," +
<br>- " {5} ({6}), {7} ({8}), {9} ({10}), {11} ({12}), {13} ({14}), {15} ({16})",
<br>- "m\u00e9thode d''arondi {0} invalide, m\u00e9thodes valides : {1} ({2}), {3} ({4})," +
<br>- " {5} ({6}), {7} ({8}), {9} ({10}), {11} ({12}), {13} ({14}), {15} ({16})" },
<br>+ { "invalid rounding method {0}, valid methods: {1} ({2}), {3} ({4}), {5} ({6}), {7} ({8}), {9} ({10}), {11} ({12}), {13} ({14}), {15} ({16})",
<br>+ "m\u00e9thode d''arondi {0} invalide, m\u00e9thodes valides : {1} ({2}), {3} ({4}), {5} ({6}), {7} ({8}), {9} ({10}), {11} ({12}), {13} ({14}), {15} ({16})" },
<br> { "Cannot normalize to an infinite value",
<br> "impossible de normaliser vers une valeur infinie" },
<br> { "Cannot normalize to NaN",
<br>@@ -225,7 +223,7 @@
<br> // org.apache.commons.math.optimization.direct.DirectSearchOptimizer
<br> { "simplex must contain at least one point",
<br> "le simplex doit contenir au moins un point" },
<br>- { "equals vertices {0} and {1} in simplex configuration",
<br>+ { "equal vertices {0} and {1} in simplex configuration",
<br> "sommets {0} et {1} \u00e9gaux dans la configuration du simplex" },
<br>
<br> // org.apache.commons.math.estimation.AbstractEstimation
<br>@@ -289,25 +287,17 @@
<br> // org.apache.commons.math.ode.nonstiff.AdaptiveStepsizeIntegrator
<br> { "minimal step size ({0,number,0.00E00}) reached, integration needs {1,number,0.00E00}",
<br> "pas minimal ({0,number,0.00E00}) atteint, l''int\u00e9gration n\u00e9cessite {1,number,0.00E00}" },
<br>- { "dimensions mismatch: state vector has dimension {0}," +
<br>- " absolute tolerance vector has dimension {1}",
<br>- "incompatibilit\u00e9 de dimensions entre le vecteur d''\u00e9tat ({0})," +
<br>- " et le vecteur de tol\u00e9rance absolue ({1})" },
<br>- { "dimensions mismatch: state vector has dimension {0}," +
<br>- " relative tolerance vector has dimension {1}",
<br>- "incompatibilit\u00e9 de dimensions entre le vecteur d''\u00e9tat ({0})," +
<br>- " et le vecteur de tol\u00e9rance relative ({1})" },
<br>+ { "dimensions mismatch: state vector has dimension {0}, absolute tolerance vector has dimension {1}",
<br>+ "incompatibilit\u00e9 de dimensions entre le vecteur d''\u00e9tat ({0}), et le vecteur de tol\u00e9rance absolue ({1})" },
<br>+ { "dimensions mismatch: state vector has dimension {0}, relative tolerance vector has dimension {1}",
<br>+ "incompatibilit\u00e9 de dimensions entre le vecteur d''\u00e9tat ({0}), et le vecteur de tol\u00e9rance relative ({1})" },
<br>
<br> // org.apache.commons.math.ode.nonstiff.AdaptiveStepsizeIntegrator,
<br> // org.apache.commons.math.ode.nonstiff.RungeKuttaIntegrator
<br>- { "dimensions mismatch: ODE problem has dimension {0}," +
<br>- " initial state vector has dimension {1}",
<br>- "incompatibilit\u00e9 de dimensions entre le probl\u00e8me ODE ({0})," +
<br>- " et le vecteur d''\u00e9tat initial ({1})" },
<br>- { "dimensions mismatch: ODE problem has dimension {0}," +
<br>- " final state vector has dimension {1}",
<br>- "incompatibilit\u00e9 de dimensions entre le probl\u00e8me ODE ({0})," +
<br>- " et le vecteur d''\u00e9tat final ({1})" },
<br>+ { "dimensions mismatch: ODE problem has dimension {0}, initial state vector has dimension {1}",
<br>+ "incompatibilit\u00e9 de dimensions entre le probl\u00e8me ODE ({0}), et le vecteur d''\u00e9tat initial ({1})" },
<br>+ { "dimensions mismatch: ODE problem has dimension {0}, final state vector has dimension {1}",
<br>+ "incompatibilit\u00e9 de dimensions entre le probl\u00e8me ODE ({0}), et le vecteur d''\u00e9tat final ({1})" },
<br> { "too small integration interval: length = {0}",
<br> "intervalle d''int\u00e9gration trop petit : {0}" },
<br>
<br>@@ -392,7 +382,7 @@
<br> // org.apache.commons.math.linear.decomposition.QRDecompositionImpl
<br> // org.apache.commons.math.linear.decomposition.SingularValueDecompositionImpl
<br> { "dimensions mismatch: got {0}x{1} but expected {2}x{3}",
<br>- "dimensions erronn\u00e9es : {0}x{1} \u00e0 la place de {2}x{3}" },
<br>+ "dimensions incoh\u00e9rentes : {0}x{1} \u00e0 la place de {2}x{3}" },
<br>
<br> // org.apache.commons.math.linear.decomposition.CholeskyDecompositionImpl
<br> // org.apache.commons.math.linear.decomposition.EigenDecompositionImpl
<br>@@ -402,7 +392,7 @@
<br> // org.apache.commons.math.linear.ArrayRealVector
<br> // org.apache.commons.math.linear.SparseRealVector
<br> { "vector length mismatch: got {0} but expected {1}",
<br>- "dimension de vecteur erronn\u00e9e : {0} \u00e0 la place de {1}" },
<br>+ "taille de vecteur invalide : {0} au lieu de {1} attendue" },
<br>
<br> // org.apache.commons.math.linear.ArrayRealVector
<br> // org.apache.commons.math.linear.ArrayFieldVector
<br>@@ -420,10 +410,6 @@
<br> "nombre de lignes invalide : {0} (doit \u00eatre positif)" },
<br> { "invalid column dimension: {0} (must be positive)",
<br> "nombre de colonnes invalide : {0} (doit \u00eatre positif)" },
<br>- { "vector length mismatch: got {0} but expected {1}",
<br>- "taille de vecteur invalide : {0} au lieu de {1} attendue" },
<br>- { "dimensions mismatch: got {0}x{1} but expected {2}x{3}",
<br>- "dimensions incoh\u00e9rentes : {0}x{1} \u00e0 la place de {2}x{3}" },
<br> { "matrix must have at least one row",
<br> "une matrice doit comporter au moins une ligne" },
<br> { "matrix must have at least one column",
<br>@@ -648,11 +634,11 @@
<br> // org.apache.commons.math.stat.descriptive.DescriptiveStatistics
<br> { "window size must be positive ({0})",
<br> "la taille de la fen\u00eatre doit \u00eatre positive ({0})" },
<br>- { "percentile implementation {0} does not support setQuantile",
<br>- "l''implantation de pourcentage {0} ne dispose pas de la m\u00e9thode setQuantile" },
<br>- { "cannot access setQuantile method in percentile implementation {0}",
<br>- "acc\u00e8s impossible \u00e0 la m\u00e9thode setQuantile" +
<br>- " dans l''implantation de pourcentage {0}" },
<br>+ { "percentile implementation {0} does not support {1}",
<br>+ "l''implantation de pourcentage {0} ne dispose pas de la m\u00e9thode {1}" },
<br>+ { "cannot access {0} method in percentile implementation {1}",
<br>+ "acc\u00e8s impossible \u00e0 la m\u00e9thode {0}" +
<br>+ " dans l''implantation de pourcentage {1}" },
<br> { "out of bounds quantile value: {0}, must be in (0, 100]",
<br> "valeur de quantile {0} hors bornes, doit \u00eatre dans l''intervalle ]0, 100]" },
<br>
<br>@@ -679,11 +665,9 @@
<br>
<br> // org.apache.commons.math.stat.descriptive.moment.Kurtosis
<br> { "statistics constructed from external moments cannot be incremented",
<br>- "les statistiques bas\u00e9es sur des moments externes " +
<br>- "ne peuvent pas \u00eatre incr\u00e9ment\u00e9es" },
<br>+ "les statistiques bas\u00e9es sur des moments externes ne peuvent pas \u00eatre incr\u00e9ment\u00e9es" },
<br> { "statistics constructed from external moments cannot be cleared",
<br>- "les statistiques bas\u00e9es sur des moments externes " +
<br>- "ne peuvent pas \u00eatre remises \u00e0 z\u00e9ro" },
<br>+ "les statistiques bas\u00e9es sur des moments externes ne peuvent pas \u00eatre remises \u00e0 z\u00e9ro" },
<br>
<br> // org.apache.commons.math.stat.inference.ChiSquareTestImpl
<br> { "expected array length = {0}, must be at least 2",
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java Sun Nov 29 21:47:51 2009
<br>@@ -33,8 +33,12 @@
<br> */
<br> public class PolynomialFunction implements DifferentiableUnivariateRealFunction, Serializable {
<br>
<br>+ /** Message for empty coefficients array. */
<br>+ private static final String EMPTY_ARRAY_MESSAGE =
<br>+ "empty polynomials coefficients array";
<br>+
<br> /**
<br>- * Serializtion identifier
<br>+ * Serialization identifier
<br> */
<br> private static final long serialVersionUID = -7726511984200295583L;
<br>
<br>@@ -62,7 +66,7 @@
<br> public PolynomialFunction(double c[]) {
<br> super();
<br> if (c.length < 1) {
<br>- throw MathRuntimeException.createIllegalArgumentException("empty polynomials coefficients array");
<br>+ throw MathRuntimeException.createIllegalArgumentException(EMPTY_ARRAY_MESSAGE);
<br> }
<br> int l = c.length;
<br> while ((l > 1) && (c[l - 1] == 0)) {
<br>@@ -122,7 +126,7 @@
<br> protected static double evaluate(double[] coefficients, double argument) {
<br> int n = coefficients.length;
<br> if (n < 1) {
<br>- throw MathRuntimeException.createIllegalArgumentException("empty polynomials coefficients array");
<br>+ throw MathRuntimeException.createIllegalArgumentException(EMPTY_ARRAY_MESSAGE);
<br> }
<br> double result = coefficients[n - 1];
<br> for (int j = n -2; j >=0; j--) {
<br>@@ -231,7 +235,7 @@
<br> protected static double[] differentiate(double[] coefficients) {
<br> int n = coefficients.length;
<br> if (n < 1) {
<br>- throw MathRuntimeException.createIllegalArgumentException("empty polynomials coefficients array");
<br>+ throw MathRuntimeException.createIllegalArgumentException(EMPTY_ARRAY_MESSAGE);
<br> }
<br> if (n == 1) {
<br> return new double[]{0};
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java Sun Nov 29 21:47:51 2009
<br>@@ -37,6 +37,15 @@
<br> * @since 1.2
<br> */
<br> public class LaguerreSolver extends UnivariateRealSolverImpl {
<br>+
<br>+ /** Message for non-polynomial function. */
<br>+ private static final String NON_POLYNOMIAL_FUNCTION_MESSAGE =
<br>+ "function is not polynomial";
<br>+
<br>+ /** Message for non-positive degree. */
<br>+ private static final String NON_POSITIVE_DEGREE_MESSAGE =
<br>+ "polynomial degree must be positive: degree={0}";
<br>+
<br> /** polynomial function to solve.
<br> * @deprecated as of 2.0 the function is not stored anymore in the instance
<br> */
<br>@@ -60,7 +69,7 @@
<br> if (f instanceof PolynomialFunction) {
<br> p = (PolynomialFunction) f;
<br> } else {
<br>- throw MathRuntimeException.createIllegalArgumentException("function is not polynomial");
<br>+ throw MathRuntimeException.createIllegalArgumentException(NON_POLYNOMIAL_FUNCTION_MESSAGE);
<br> }
<br> }
<br>
<br>@@ -162,7 +171,7 @@
<br>
<br> // check function type
<br> if (!(f instanceof PolynomialFunction)) {
<br>- throw MathRuntimeException.createIllegalArgumentException("function is not polynomial");
<br>+ throw MathRuntimeException.createIllegalArgumentException(NON_POLYNOMIAL_FUNCTION_MESSAGE);
<br> }
<br>
<br> // check for zeros before verifying bracketing
<br>@@ -255,7 +264,7 @@
<br> int iterationCount = 0;
<br> if (n < 1) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "polynomial degree must be positive: degree={0}", n);
<br>+ NON_POSITIVE_DEGREE_MESSAGE, n);
<br> }
<br> Complex c[] = new Complex[n+1]; // coefficients for deflated polynomial
<br> for (int i = 0; i <= n; i++) {
<br>@@ -303,7 +312,7 @@
<br> int n = coefficients.length - 1;
<br> if (n < 1) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "polynomial degree must be positive: degree={0}", n);
<br>+ NON_POSITIVE_DEGREE_MESSAGE, n);
<br> }
<br> Complex N = new Complex(n, 0.0);
<br> Complex N1 = new Complex(n - 1, 0.0);
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java Sun Nov 29 21:47:51 2009
<br>@@ -27,6 +27,11 @@
<br> * @version $Revision$ $Date$
<br> */
<br> public class UnivariateRealSolverUtils {
<br>+
<br>+ /** Message for null function.*/
<br>+ private static final String NULL_FUNCTION_MESSAGE =
<br>+ "function is null";
<br>+
<br> /**
<br> * Default constructor.
<br> */
<br>@@ -168,7 +173,7 @@
<br> FunctionEvaluationException {
<br>
<br> if (function == null) {
<br>- throw MathRuntimeException.createIllegalArgumentException("function is null");
<br>+ throw MathRuntimeException.createIllegalArgumentException(NULL_FUNCTION_MESSAGE);
<br> }
<br> if (maximumIterations <= 0) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>@@ -225,7 +230,7 @@
<br> */
<br> private static void setup(UnivariateRealFunction f) {
<br> if (f == null) {
<br>- throw MathRuntimeException.createIllegalArgumentException("function is null");
<br>+ throw MathRuntimeException.createIllegalArgumentException(NULL_FUNCTION_MESSAGE);
<br> }
<br> }
<br>
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java Sun Nov 29 21:47:51 2009
<br>@@ -32,6 +32,14 @@
<br> public abstract class AbstractIntegerDistribution extends AbstractDistribution
<br> implements IntegerDistribution, Serializable {
<br>
<br>+ /** Message for endpoints in wrong order. */
<br>+ private static final String WRONG_ORDER_ENDPOINTS_MESSAGE =
<br>+ "lower endpoint ({0}) must be less than or equal to upper endpoint ({1})";
<br>+
<br>+ /** Message for out of range point. */
<br>+ private static final String OUT_OF_RANGE_POINT =
<br>+ "{0} out of [{1}, {2}] range";
<br>+
<br> /** Serializable version identifier */
<br> private static final long serialVersionUID = -1146319659338487221L;
<br>
<br>@@ -79,8 +87,7 @@
<br> throws MathException {
<br> if (x0 > x1) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "lower endpoint ({0}) must be less than or equal to upper endpoint ({1})",
<br>- x0, x1);
<br>+ WRONG_ORDER_ENDPOINTS_MESSAGE, x0, x1);
<br> }
<br> if (Math.floor(x0) < x0) {
<br> return cumulativeProbability(((int) Math.floor(x0)) + 1,
<br>@@ -137,8 +144,7 @@
<br> public double cumulativeProbability(int x0, int x1) throws MathException {
<br> if (x0 > x1) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "lower endpoint ({0}) must be less than or equal to upper endpoint ({1})",
<br>- x0, x1);
<br>+ WRONG_ORDER_ENDPOINTS_MESSAGE, x0, x1);
<br> }
<br> return cumulativeProbability(x1) - cumulativeProbability(x0 - 1);
<br> }
<br>@@ -157,7 +163,7 @@
<br> public int inverseCumulativeProbability(final double p) throws MathException{
<br> if (p < 0.0 || p > 1.0) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "{0} out of [{1}, {2}] range", p, 0.0, 1.0);
<br>+ OUT_OF_RANGE_POINT, p, 0.0, 1.0);
<br> }
<br>
<br> // by default, do simple bisection.
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java Sun Nov 29 21:47:51 2009
<br>@@ -32,6 +32,10 @@
<br> extends AbstractContinuousDistribution
<br> implements FDistribution, Serializable {
<br>
<br>+ /** Message for non positive degrees of freddom. */
<br>+ private static final String NON_POSITIVE_DEGREES_OF_FREEDOM_MESSAGE =
<br>+ "degrees of freedom must be positive ({0})";
<br>+
<br> /** Serializable version identifier */
<br> private static final long serialVersionUID = -8516354193418641566L;
<br>
<br>@@ -164,8 +168,7 @@
<br> public void setNumeratorDegreesOfFreedom(double degreesOfFreedom) {
<br> if (degreesOfFreedom <= 0.0) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "degrees of freedom must be positive ({0})",
<br>- degreesOfFreedom);
<br>+ NON_POSITIVE_DEGREES_OF_FREEDOM_MESSAGE, degreesOfFreedom);
<br> }
<br> this.numeratorDegreesOfFreedom = degreesOfFreedom;
<br> }
<br>@@ -187,8 +190,7 @@
<br> public void setDenominatorDegreesOfFreedom(double degreesOfFreedom) {
<br> if (degreesOfFreedom <= 0.0) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "degrees of freedom must be positive ({0})",
<br>- degreesOfFreedom);
<br>+ NON_POSITIVE_DEGREES_OF_FREEDOM_MESSAGE, degreesOfFreedom);
<br> }
<br> this.denominatorDegreesOfFreedom = degreesOfFreedom;
<br> }
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/BigFraction.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/BigFraction.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/BigFraction.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/BigFraction.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/BigFraction.java Sun Nov 29 21:47:51 2009
<br>@@ -80,6 +80,10 @@
<br> /** Serializable version identifier. */
<br> private static final long serialVersionUID = -5630213147331578515L;
<br>
<br>+ /** Message for zero denominator. */
<br>+ private static final String FORBIDDEN_ZERO_DENOMINATOR =
<br>+ "denominator must be different from 0";
<br>+
<br> /** <code>BigInteger</code> representation of 100. */
<br> private static final BigInteger ONE_HUNDRED_DOUBLE = BigInteger.valueOf(100);
<br>
<br>@@ -125,7 +129,7 @@
<br> throw MathRuntimeException.createNullPointerException("denominator is null");
<br> }
<br> if (BigInteger.ZERO.equals(den)) {
<br>- throw MathRuntimeException.createArithmeticException("denominator must be different from 0");
<br>+ throw MathRuntimeException.createArithmeticException(FORBIDDEN_ZERO_DENOMINATOR);
<br> }
<br> if (BigInteger.ZERO.equals(num)) {
<br> numerator = BigInteger.ZERO;
<br>@@ -615,7 +619,7 @@
<br> */
<br> public BigFraction divide(final BigInteger bg) {
<br> if (BigInteger.ZERO.equals(bg)) {
<br>- throw MathRuntimeException.createArithmeticException("denominator must be different from 0");
<br>+ throw MathRuntimeException.createArithmeticException(FORBIDDEN_ZERO_DENOMINATOR);
<br> }
<br> return new BigFraction(numerator, denominator.multiply(bg));
<br> }
<br>@@ -668,7 +672,7 @@
<br> */
<br> public BigFraction divide(final BigFraction fraction) {
<br> if (BigInteger.ZERO.equals(fraction.numerator)) {
<br>- throw MathRuntimeException.createArithmeticException("denominator must be different from 0");
<br>+ throw MathRuntimeException.createArithmeticException(FORBIDDEN_ZERO_DENOMINATOR);
<br> }
<br>
<br> return multiply(fraction.reciprocal());
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/Fraction.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/Fraction.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/Fraction.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/Fraction.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/fraction/Fraction.java Sun Nov 29 21:47:51 2009
<br>@@ -77,6 +77,18 @@
<br> /** A fraction representing "-1 / 1". */
<br> public static final Fraction MINUS_ONE = new Fraction(-1, 1);
<br>
<br>+ /** Message for zero denominator. */
<br>+ private static final String ZERO_DENOMINATOR_MESSAGE =
<br>+ "zero denominator in fraction {0}/{1}";
<br>+
<br>+ /** Message for overflow. */
<br>+ private static final String OVERFLOW_MESSAGE =
<br>+ "overflow in fraction {0}/{1}, cannot negate";
<br>+
<br>+ /** Message for null fraction. */
<br>+ private static final String NULL_FRACTION =
<br>+ "null fraction";
<br>+
<br> /** Serializable version identifier */
<br> private static final long serialVersionUID = 3698073679419233275L;
<br>
<br>@@ -252,13 +264,13 @@
<br> */
<br> public Fraction(int num, int den) {
<br> if (den == 0) {
<br>- throw MathRuntimeException.createArithmeticException("zero denominator in fraction {0}/{1}",
<br>- num, den);
<br>+ throw MathRuntimeException.createArithmeticException(
<br>+ ZERO_DENOMINATOR_MESSAGE, num, den);
<br> }
<br> if (den < 0) {
<br> if (num == Integer.MIN_VALUE || den == Integer.MIN_VALUE) {
<br>- throw MathRuntimeException.createArithmeticException("overflow in fraction {0}/{1}, cannot negate",
<br>- num, den);
<br>+ throw MathRuntimeException.createArithmeticException(
<br>+ OVERFLOW_MESSAGE, num, den);
<br> }
<br> num = -num;
<br> den = -den;
<br>@@ -409,8 +421,8 @@
<br> */
<br> public Fraction negate() {
<br> if (numerator==Integer.MIN_VALUE) {
<br>- throw MathRuntimeException.createArithmeticException("overflow in fraction {0}/{1}, cannot negate",
<br>- numerator, denominator);
<br>+ throw MathRuntimeException.createArithmeticException(
<br>+ OVERFLOW_MESSAGE, numerator, denominator);
<br> }
<br> return new Fraction(-numerator, denominator);
<br> }
<br>@@ -481,7 +493,7 @@
<br> */
<br> private Fraction addSub(Fraction fraction, boolean isAdd) {
<br> if (fraction == null) {
<br>- throw MathRuntimeException.createIllegalArgumentException("null fraction");
<br>+ throw MathRuntimeException.createIllegalArgumentException(NULL_FRACTION);
<br> }
<br> // zero is identity for addition.
<br> if (numerator == 0) {
<br>@@ -538,7 +550,7 @@
<br> */
<br> public Fraction multiply(Fraction fraction) {
<br> if (fraction == null) {
<br>- throw MathRuntimeException.createIllegalArgumentException("null fraction");
<br>+ throw MathRuntimeException.createIllegalArgumentException(NULL_FRACTION);
<br> }
<br> if (numerator == 0 || fraction.numerator == 0) {
<br> return ZERO;
<br>@@ -573,7 +585,7 @@
<br> */
<br> public Fraction divide(Fraction fraction) {
<br> if (fraction == null) {
<br>- throw MathRuntimeException.createIllegalArgumentException("null fraction");
<br>+ throw MathRuntimeException.createIllegalArgumentException(NULL_FRACTION);
<br> }
<br> if (fraction.numerator == 0) {
<br> throw MathRuntimeException.createArithmeticException(
<br>@@ -606,8 +618,7 @@
<br> public static Fraction getReducedFraction(int numerator, int denominator) {
<br> if (denominator == 0) {
<br> throw MathRuntimeException.createArithmeticException(
<br>- "zero denominator in fraction {0}/{1}",
<br>- numerator, denominator);
<br>+ ZERO_DENOMINATOR_MESSAGE, numerator, denominator);
<br> }
<br> if (numerator==0) {
<br> return ZERO; // normalize zero.
<br>@@ -620,8 +631,7 @@
<br> if (numerator==Integer.MIN_VALUE ||
<br> denominator==Integer.MIN_VALUE) {
<br> throw MathRuntimeException.createArithmeticException(
<br>- "overflow in fraction {0}/{1}, cannot negate",
<br>- numerator, denominator);
<br>+ OVERFLOW_MESSAGE, numerator, denominator);
<br> }
<br> numerator = -numerator;
<br> denominator = -denominator;
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java Sun Nov 29 21:47:51 2009
<br>@@ -39,6 +39,26 @@
<br> /** Serializable version identifier */
<br> private static final long serialVersionUID = 7260756672015356458L;
<br>
<br>+ /** Message for at least one row. */
<br>+ private static final String AT_LEAST_ONE_ROW_MESSAGE =
<br>+ "matrix must have at least one row";
<br>+
<br>+ /** Message for at least one column. */
<br>+ private static final String AT_LEAST_ONE_COLUMN_MESSAGE =
<br>+ "matrix must have at least one column";
<br>+
<br>+ /** Message for different rows lengths. */
<br>+ private static final String DIFFERENT_ROWS_LENGTHS_MESSAGE =
<br>+ "some rows have length {0} while others have length {1}";
<br>+
<br>+ /** Message for no entry at selected indices. */
<br>+ private static final String NO_ENTRY_MESSAGE =
<br>+ "no entry at indices ({0}, {1}) in a {2}x{3} matrix";
<br>+
<br>+ /** Message for vector lengths mismatch. */
<br>+ private static final String VECTOR_LENGTHS_MISMATCH =
<br>+ "vector length mismatch: got {0} but expected {1}";
<br>+
<br> /** Entries of the matrix */
<br> protected T[][] data;
<br>
<br>@@ -111,17 +131,18 @@
<br> }
<br> final int nRows = d.length;
<br> if (nRows == 0) {
<br>- throw MathRuntimeException.createIllegalArgumentException("matrix must have at least one row");
<br>+ throw MathRuntimeException.createIllegalArgumentException(
<br>+ AT_LEAST_ONE_ROW_MESSAGE);
<br> }
<br> final int nCols = d[0].length;
<br> if (nCols == 0) {
<br>- throw MathRuntimeException.createIllegalArgumentException("matrix must have at least one column");
<br>+ throw MathRuntimeException.createIllegalArgumentException(
<br>+ AT_LEAST_ONE_COLUMN_MESSAGE);
<br> }
<br> for (int r = 1; r < nRows; r++) {
<br> if (d[r].length != nCols) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "some rows have length {0} while others have length {1}",
<br>- nCols, d[r].length);
<br>+ DIFFERENT_ROWS_LENGTHS_MESSAGE, nCols, d[r].length);
<br> }
<br> }
<br> data = d;
<br>@@ -306,29 +327,28 @@
<br> if (data == null) {
<br> if (row > 0) {
<br> throw MathRuntimeException.createIllegalStateException(
<br>- "first {0} rows are not initialized yet",
<br>- row);
<br>+ "first {0} rows are not initialized yet", row);
<br> }
<br> if (column > 0) {
<br> throw MathRuntimeException.createIllegalStateException(
<br>- "first {0} columns are not initialized yet",
<br>- column);
<br>+ "first {0} columns are not initialized yet", column);
<br> }
<br> final int nRows = subMatrix.length;
<br> if (nRows == 0) {
<br>- throw MathRuntimeException.createIllegalArgumentException("matrix must have at least one row");
<br>+ throw MathRuntimeException.createIllegalArgumentException(
<br>+ AT_LEAST_ONE_ROW_MESSAGE);
<br> }
<br>
<br> final int nCols = subMatrix[0].length;
<br> if (nCols == 0) {
<br>- throw MathRuntimeException.createIllegalArgumentException("matrix must have at least one column");
<br>+ throw MathRuntimeException.createIllegalArgumentException(
<br>+ AT_LEAST_ONE_COLUMN_MESSAGE);
<br> }
<br> data = buildArray(getField(), subMatrix.length, nCols);
<br> for (int i = 0; i < data.length; ++i) {
<br> if (subMatrix[i].length != nCols) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "some rows have length {0} while others have length {1}",
<br>- nCols, subMatrix[i].length);
<br>+ DIFFERENT_ROWS_LENGTHS_MESSAGE, nCols, subMatrix[i].length);
<br> }
<br> System.arraycopy(subMatrix[i], 0, data[i + row], column, nCols);
<br> }
<br>@@ -346,8 +366,7 @@
<br> return data[row][column];
<br> } catch (ArrayIndexOutOfBoundsException e) {
<br> throw new MatrixIndexException(
<br>- "no entry at indices ({0}, {1}) in a {2}x{3} matrix",
<br>- row, column, getRowDimension(), getColumnDimension());
<br>+ NO_ENTRY_MESSAGE, row, column, getRowDimension(), getColumnDimension());
<br> }
<br> }
<br>
<br>@@ -359,8 +378,7 @@
<br> data[row][column] = value;
<br> } catch (ArrayIndexOutOfBoundsException e) {
<br> throw new MatrixIndexException(
<br>- "no entry at indices ({0}, {1}) in a {2}x{3} matrix",
<br>- row, column, getRowDimension(), getColumnDimension());
<br>+ NO_ENTRY_MESSAGE, row, column, getRowDimension(), getColumnDimension());
<br> }
<br> }
<br>
<br>@@ -372,8 +390,7 @@
<br> data[row][column] = data[row][column].add(increment);
<br> } catch (ArrayIndexOutOfBoundsException e) {
<br> throw new MatrixIndexException(
<br>- "no entry at indices ({0}, {1}) in a {2}x{3} matrix",
<br>- row, column, getRowDimension(), getColumnDimension());
<br>+ NO_ENTRY_MESSAGE, row, column, getRowDimension(), getColumnDimension());
<br> }
<br> }
<br>
<br>@@ -385,8 +402,7 @@
<br> data[row][column] = data[row][column].multiply(factor);
<br> } catch (ArrayIndexOutOfBoundsException e) {
<br> throw new MatrixIndexException(
<br>- "no entry at indices ({0}, {1}) in a {2}x{3} matrix",
<br>- row, column, getRowDimension(), getColumnDimension());
<br>+ NO_ENTRY_MESSAGE, row, column, getRowDimension(), getColumnDimension());
<br> }
<br> }
<br>
<br>@@ -410,8 +426,7 @@
<br> final int nCols = this.getColumnDimension();
<br> if (v.length != nCols) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "vector length mismatch: got {0} but expected {1}",
<br>- v.length, nCols);
<br>+ VECTOR_LENGTHS_MISMATCH, v.length, nCols);
<br> }
<br> final T[] out = buildArray(getField(), nRows);
<br> for (int row = 0; row < nRows; row++) {
<br>@@ -434,8 +449,7 @@
<br> final int nCols = getColumnDimension();
<br> if (v.length != nRows) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "vector length mismatch: got {0} but expected {1}",
<br>- v.length, nRows);
<br>+ VECTOR_LENGTHS_MISMATCH, v.length, nRows);
<br> }
<br>
<br> final T[] out = buildArray(getField(), nCols);
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java Sun Nov 29 21:47:51 2009
<br>@@ -54,6 +54,26 @@
<br> /** Serializable version identifier */
<br> private static final long serialVersionUID = -1067294169172445528L;
<br>
<br>+ /** Message for at least one row. */
<br>+ private static final String AT_LEAST_ONE_ROW_MESSAGE =
<br>+ "matrix must have at least one row";
<br>+
<br>+ /** Message for at least one column. */
<br>+ private static final String AT_LEAST_ONE_COLUMN_MESSAGE =
<br>+ "matrix must have at least one column";
<br>+
<br>+ /** Message for different rows lengths. */
<br>+ private static final String DIFFERENT_ROWS_LENGTHS_MESSAGE =
<br>+ "some rows have length {0} while others have length {1}";
<br>+
<br>+ /** Message for no entry at selected indices. */
<br>+ private static final String NO_ENTRY_MESSAGE =
<br>+ "no entry at indices ({0}, {1}) in a {2}x{3} matrix";
<br>+
<br>+ /** Message for vector lengths mismatch. */
<br>+ private static final String VECTOR_LENGTHS_MISMATCH =
<br>+ "vector length mismatch: got {0} but expected {1}";
<br>+
<br> /** Entries of the matrix */
<br> protected double data[][];
<br>
<br>@@ -120,17 +140,18 @@
<br> }
<br> final int nRows = d.length;
<br> if (nRows == 0) {
<br>- throw MathRuntimeException.createIllegalArgumentException("matrix must have at least one row");
<br>+ throw MathRuntimeException.createIllegalArgumentException(
<br>+ AT_LEAST_ONE_ROW_MESSAGE);
<br> }
<br> final int nCols = d[0].length;
<br> if (nCols == 0) {
<br>- throw MathRuntimeException.createIllegalArgumentException("matrix must have at least one column");
<br>+ throw MathRuntimeException.createIllegalArgumentException(
<br>+ AT_LEAST_ONE_COLUMN_MESSAGE);
<br> }
<br> for (int r = 1; r < nRows; r++) {
<br> if (d[r].length != nCols) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "some rows have length {0} while others have length {1}",
<br>- nCols, d[r].length);
<br>+ DIFFERENT_ROWS_LENGTHS_MESSAGE, nCols, d[r].length);
<br> }
<br> }
<br> data = d;
<br>@@ -314,29 +335,28 @@
<br> if (data == null) {
<br> if (row > 0) {
<br> throw MathRuntimeException.createIllegalStateException(
<br>- "first {0} rows are not initialized yet",
<br>- row);
<br>+ "first {0} rows are not initialized yet", row);
<br> }
<br> if (column > 0) {
<br> throw MathRuntimeException.createIllegalStateException(
<br>- "first {0} columns are not initialized yet",
<br>- column);
<br>+ "first {0} columns are not initialized yet", column);
<br> }
<br> final int nRows = subMatrix.length;
<br> if (nRows == 0) {
<br>- throw MathRuntimeException.createIllegalArgumentException("matrix must have at least one row");
<br>+ throw MathRuntimeException.createIllegalArgumentException(
<br>+ AT_LEAST_ONE_ROW_MESSAGE);
<br> }
<br>
<br> final int nCols = subMatrix[0].length;
<br> if (nCols == 0) {
<br>- throw MathRuntimeException.createIllegalArgumentException("matrix must have at least one column");
<br>+ throw MathRuntimeException.createIllegalArgumentException(
<br>+ AT_LEAST_ONE_COLUMN_MESSAGE);
<br> }
<br> data = new double[subMatrix.length][nCols];
<br> for (int i = 0; i < data.length; ++i) {
<br> if (subMatrix[i].length != nCols) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "some rows have length {0} while others have length {1}",
<br>- nCols, subMatrix[i].length);
<br>+ DIFFERENT_ROWS_LENGTHS_MESSAGE, nCols, subMatrix[i].length);
<br> }
<br> System.arraycopy(subMatrix[i], 0, data[i + row], column, nCols);
<br> }
<br>@@ -354,8 +374,7 @@
<br> return data[row][column];
<br> } catch (ArrayIndexOutOfBoundsException e) {
<br> throw new MatrixIndexException(
<br>- "no entry at indices ({0}, {1}) in a {2}x{3} matrix",
<br>- row, column, getRowDimension(), getColumnDimension());
<br>+ NO_ENTRY_MESSAGE, row, column, getRowDimension(), getColumnDimension());
<br> }
<br> }
<br>
<br>@@ -367,8 +386,7 @@
<br> data[row][column] = value;
<br> } catch (ArrayIndexOutOfBoundsException e) {
<br> throw new MatrixIndexException(
<br>- "no entry at indices ({0}, {1}) in a {2}x{3} matrix",
<br>- row, column, getRowDimension(), getColumnDimension());
<br>+ NO_ENTRY_MESSAGE, row, column, getRowDimension(), getColumnDimension());
<br> }
<br> }
<br>
<br>@@ -380,8 +398,7 @@
<br> data[row][column] += increment;
<br> } catch (ArrayIndexOutOfBoundsException e) {
<br> throw new MatrixIndexException(
<br>- "no entry at indices ({0}, {1}) in a {2}x{3} matrix",
<br>- row, column, getRowDimension(), getColumnDimension());
<br>+ NO_ENTRY_MESSAGE, row, column, getRowDimension(), getColumnDimension());
<br> }
<br> }
<br>
<br>@@ -393,8 +410,7 @@
<br> data[row][column] *= factor;
<br> } catch (ArrayIndexOutOfBoundsException e) {
<br> throw new MatrixIndexException(
<br>- "no entry at indices ({0}, {1}) in a {2}x{3} matrix",
<br>- row, column, getRowDimension(), getColumnDimension());
<br>+ NO_ENTRY_MESSAGE, row, column, getRowDimension(), getColumnDimension());
<br> }
<br> }
<br>
<br>@@ -418,8 +434,7 @@
<br> final int nCols = this.getColumnDimension();
<br> if (v.length != nCols) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "vector length mismatch: got {0} but expected {1}",
<br>- v.length, nCols);
<br>+ VECTOR_LENGTHS_MISMATCH, v.length, nCols);
<br> }
<br> final double[] out = new double[nRows];
<br> for (int row = 0; row < nRows; row++) {
<br>@@ -442,8 +457,7 @@
<br> final int nCols = getColumnDimension();
<br> if (v.length != nRows) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "vector length mismatch: got {0} but expected {1}",
<br>- v.length, nRows);
<br>+ VECTOR_LENGTHS_MISMATCH, v.length, nRows);
<br> }
<br>
<br> final double[] out = new double[nCols];
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java Sun Nov 29 21:47:51 2009
<br>@@ -29,6 +29,10 @@
<br> */
<br> public class ArrayRealVector implements RealVector, Serializable {
<br>
<br>+ /** Message for non fitting position and size. */
<br>+ private static final String NON_FITTING_POSITION_AND_SIZE_MESSAGE =
<br>+ "position {0} and size {1} don't fit to the size of the input array {2}";
<br>+
<br> /** Serializable version identifier. */
<br> private static final long serialVersionUID = -1097961340710804027L;
<br>
<br>@@ -112,8 +116,7 @@
<br> public ArrayRealVector(double[] d, int pos, int size) {
<br> if (d.length < pos + size) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "position {0} and size {1} don't fit to the size of the input array {2}",
<br>- pos, size, d.length);
<br>+ NON_FITTING_POSITION_AND_SIZE_MESSAGE, pos, size, d.length);
<br> }
<br> data = new double[size];
<br> System.arraycopy(d, pos, data, 0, size);
<br>@@ -139,8 +142,7 @@
<br> public ArrayRealVector(Double[] d, int pos, int size) {
<br> if (d.length < pos + size) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "position {0} and size {1} don't fit to the size of the input array {2}",
<br>- pos, size, d.length);
<br>+ NON_FITTING_POSITION_AND_SIZE_MESSAGE, pos, size, d.length);
<br> }
<br> data = new double[size];
<br> for (int i = pos; i < pos + size; i++) {
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java Sun Nov 29 21:47:51 2009
<br>@@ -36,6 +36,10 @@
<br> /** Default bound to determine effective singularity in LU decomposition */
<br> private static final double DEFAULT_TOO_SMALL = 10E-12;
<br>
<br>+ /** Message for vector length mismatch. */
<br>+ private static final String VECTOR_LENGTH_MISMATCH_MESSAGE =
<br>+ "vector length mismatch: got {0} but expected {1}";
<br>+
<br> /** Entries of LU decomposition. */
<br> private double lu[][];
<br>
<br>@@ -262,8 +266,7 @@
<br> final int m = pivot.length;
<br> if (b.length != m) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "vector length mismatch: got {0} but expected {1}",
<br>- b.length, m);
<br>+ VECTOR_LENGTH_MISMATCH_MESSAGE, b.length, m);
<br> }
<br> if (singular) {
<br> throw new SingularMatrixException();
<br>@@ -307,8 +310,7 @@
<br> final int m = pivot.length;
<br> if (b.getDimension() != m) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "vector length mismatch: got {0} but expected {1}",
<br>- b.getDimension(), m);
<br>+ VECTOR_LENGTH_MISMATCH_MESSAGE, b.getDimension(), m);
<br> }
<br> if (singular) {
<br> throw new SingularMatrixException();
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java Sun Nov 29 21:47:51 2009
<br>@@ -87,6 +87,14 @@
<br> */
<br> public abstract class DirectSearchOptimizer implements MultivariateRealOptimizer {
<br>
<br>+ /** Message for equal vertices. */
<br>+ private static final String EQUAL_VERTICES_MESSAGE =
<br>+ "equal vertices {0} and {1} in simplex configuration";
<br>+
<br>+ /** Message for dimension mismatch. */
<br>+ private static final String DIMENSION_MISMATCH_MESSAGE =
<br>+ "dimension mismatch {0} != {1}";
<br>+
<br> /** Simplex. */
<br> protected RealPointValuePair[] simplex;
<br>
<br>@@ -146,8 +154,7 @@
<br> for (int j = 0; j < i + 1; ++j) {
<br> if (steps[j] == 0.0) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "equals vertices {0} and {1} in simplex configuration",
<br>- j, j + 1);
<br>+ EQUAL_VERTICES_MESSAGE, j, j + 1);
<br> }
<br> System.arraycopy(steps, 0, vertexI, 0, j + 1);
<br> }
<br>@@ -184,8 +191,7 @@
<br> // safety checks
<br> if (refI.length != n) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "dimension mismatch {0} != {1}",
<br>- refI.length, n);
<br>+ DIMENSION_MISMATCH_MESSAGE, refI.length, n);
<br> }
<br> for (int j = 0; j < i; ++j) {
<br> final double[] refJ = referenceSimplex[j];
<br>@@ -198,8 +204,7 @@
<br> }
<br> if (allEquals) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "equals vertices {0} and {1} in simplex configuration",
<br>- i, j);
<br>+ EQUAL_VERTICES_MESSAGE, i, j);
<br> }
<br> }
<br>
<br>@@ -360,8 +365,7 @@
<br> final int n = startPoint.length;
<br> if (n != startConfiguration.length) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "dimension mismatch {0} != {1}",
<br>- n, startConfiguration.length);
<br>+ DIMENSION_MISMATCH_MESSAGE, n, startConfiguration.length);
<br> }
<br>
<br> // set first vertex
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/linear/SimplexTableau.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/linear/SimplexTableau.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/linear/SimplexTableau.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/linear/SimplexTableau.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/linear/SimplexTableau.java Sun Nov 29 21:47:51 2009
<br>@@ -62,6 +62,9 @@
<br> */
<br> class SimplexTableau implements Serializable {
<br>
<br>+ /** Column label for negative vars. */
<br>+ private static final String NEGATIVE_VAR_COLUMN_LABEL = "x-";
<br>+
<br> /** Serializable version identifier. */
<br> private static final long serialVersionUID = -1369660067587938365L;
<br>
<br>@@ -131,7 +134,7 @@
<br> columnLabels.add("x" + i);
<br> }
<br> if (!restrictToNonNegative) {
<br>- columnLabels.add("x-");
<br>+ columnLabels.add(NEGATIVE_VAR_COLUMN_LABEL);
<br> }
<br> for (int i = 0; i < getNumSlackVariables(); i++) {
<br> columnLabels.add("s" + i);
<br>@@ -363,7 +366,7 @@
<br> * @return current solution
<br> */
<br> protected RealPointValuePair getSolution() {
<br>- int negativeVarColumn = columnLabels.indexOf("x-");
<br>+ int negativeVarColumn = columnLabels.indexOf(NEGATIVE_VAR_COLUMN_LABEL);
<br> Integer negativeVarBasicRow = negativeVarColumn > 0 ? getBasicRow(negativeVarColumn) : null;
<br> double mostNegative = negativeVarBasicRow == null ? 0 : getEntry(negativeVarBasicRow, getRhsOffset());
<br>
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java Sun Nov 29 21:47:51 2009
<br>@@ -65,6 +65,17 @@
<br> /** Serialization UID */
<br> private static final long serialVersionUID = 4133067267405273064L;
<br>
<br>+ /** Name of the setQuantile method. */
<br>+ private static final String SET_QUANTILE_METHOD_NAME = "setQuantile";
<br>+
<br>+ /** Message for unsupported setQuantile. */
<br>+ private static final String UNSUPPORTED_METHOD_MESSAGE =
<br>+ "percentile implementation {0} does not support {1}";
<br>+
<br>+ /** Message for illegal accesson setquantile. */
<br>+ private static final String ILLEGAL_ACCESS_MESSAGE =
<br>+ "cannot access {0} method in percentile implementation {1}";
<br>+
<br> /** hold the window size **/
<br> protected int windowSize = INFINITE_WINDOW;
<br>
<br>@@ -377,17 +388,17 @@
<br> ((Percentile) percentileImpl).setQuantile(p);
<br> } else {
<br> try {
<br>- percentileImpl.getClass().getMethod("setQuantile",
<br>+ percentileImpl.getClass().getMethod(SET_QUANTILE_METHOD_NAME,
<br> new Class[] {Double.TYPE}).invoke(percentileImpl,
<br> new Object[] {Double.valueOf(p)});
<br> } catch (NoSuchMethodException e1) { // Setter guard should prevent
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "percentile implementation {0} does not support setQuantile",
<br>- percentileImpl.getClass().getName());
<br>+ UNSUPPORTED_METHOD_MESSAGE,
<br>+ percentileImpl.getClass().getName(), SET_QUANTILE_METHOD_NAME);
<br> } catch (IllegalAccessException e2) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "cannot access setQuantile method in percentile implementation {0}",
<br>- percentileImpl.getClass().getName());
<br>+ ILLEGAL_ACCESS_MESSAGE,
<br>+ SET_QUANTILE_METHOD_NAME, percentileImpl.getClass().getName());
<br> } catch (InvocationTargetException e3) {
<br> throw MathRuntimeException.createIllegalArgumentException(e3.getCause());
<br> }
<br>@@ -560,7 +571,7 @@
<br> public synchronized void setPercentileImpl(
<br> UnivariateStatistic percentileImpl) {
<br> try {
<br>- percentileImpl.getClass().getMethod("setQuantile",
<br>+ percentileImpl.getClass().getMethod(SET_QUANTILE_METHOD_NAME,
<br> new Class[] {Double.TYPE}).invoke(percentileImpl,
<br> new Object[] {Double.valueOf(50.0d)});
<br> } catch (NoSuchMethodException e1) {
<br>@@ -569,8 +580,8 @@
<br> percentileImpl.getClass().getName());
<br> } catch (IllegalAccessException e2) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "cannot access setQuantile method in percentile implementation {0}",
<br>- percentileImpl.getClass().getName());
<br>+ ILLEGAL_ACCESS_MESSAGE,
<br>+ SET_QUANTILE_METHOD_NAME, percentileImpl.getClass().getName());
<br> } catch (InvocationTargetException e3) {
<br> throw MathRuntimeException.createIllegalArgumentException(e3.getCause());
<br> }
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java Sun Nov 29 21:47:51 2009
<br>@@ -33,6 +33,10 @@
<br> */
<br> public class TTestImpl implements TTest {
<br>
<br>+ /** Message for insufficient data. */
<br>+ private static final String INSUFFICIENT_DATA_MESSAGE =
<br>+ "insufficient data for t statistic, needs at least 2, got {0}";
<br>+
<br> /** Distribution used to compute inference statistics. */
<br> private TDistribution distribution;
<br>
<br>@@ -1039,7 +1043,7 @@
<br> throws IllegalArgumentException {
<br> if ((data == null) || (data.length < 2)) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "insufficient data for t statistic, needs at least 2, got {0}",
<br>+ INSUFFICIENT_DATA_MESSAGE,
<br> (data == null) ? 0 : data.length);
<br> }
<br> }
<br>@@ -1052,7 +1056,7 @@
<br> throws IllegalArgumentException {
<br> if ((stat == null) || (stat.getN() < 2)) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "insufficient data for t statistic, needs at least 2, got {0}",
<br>+ INSUFFICIENT_DATA_MESSAGE,
<br> (stat == null) ? 0 : stat.getN());
<br> }
<br> }
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java Sun Nov 29 21:47:51 2009
<br>@@ -48,6 +48,22 @@
<br> /** Serializable version identifier. */
<br> static final long serialVersionUID = 5138259215438106000L;
<br>
<br>+ /** Message for not power of 2. */
<br>+ private static final String NOT_POWER_OF_TWO_MESSAGE =
<br>+ "{0} is not a power of 2, consider padding for fix";
<br>+
<br>+ /** Message for dimension mismatch. */
<br>+ private static final String DIMENSION_MISMATCH_MESSAGE =
<br>+ "some dimensions don't match: {0} != {1}";
<br>+
<br>+ /** Message for not computed roots of unity. */
<br>+ private static final String MISSING_ROOTS_OF_UNITY_MESSAGE =
<br>+ "roots of unity have not been computed yet";
<br>+
<br>+ /** Message for out of range root index. */
<br>+ private static final String OUT_OF_RANGE_ROOT_INDEX_MESSAGE =
<br>+ "out of range root of unity index {0} (must be in [{1};{2}])";
<br>+
<br> /** roots of unity */
<br> private RootsOfUnity roots = new RootsOfUnity();
<br>
<br>@@ -494,8 +510,7 @@
<br> public static void verifyDataSet(double d[]) throws IllegalArgumentException {
<br> if (!isPowerOf2(d.length)) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "{0} is not a power of 2, consider padding for fix",
<br>- d.length);
<br>+ NOT_POWER_OF_TWO_MESSAGE, d.length);
<br> }
<br> }
<br>
<br>@@ -508,8 +523,7 @@
<br> public static void verifyDataSet(Object o[]) throws IllegalArgumentException {
<br> if (!isPowerOf2(o.length)) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "{0} is not a power of 2, consider padding for fix",
<br>- o.length);
<br>+ NOT_POWER_OF_TWO_MESSAGE, o.length);
<br> }
<br> }
<br>
<br>@@ -663,15 +677,13 @@
<br> if (vector == null) {
<br> if (dimensionSize.length > 0) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "some dimensions don't match: {0} != {1}",
<br>- 0, dimensionSize.length);
<br>+ DIMENSION_MISMATCH_MESSAGE, 0, dimensionSize.length);
<br> }
<br> return null;
<br> }
<br> if (vector.length != dimensionSize.length) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "some dimensions don't match: {0} != {1}",
<br>- vector.length, dimensionSize.length);
<br>+ DIMENSION_MISMATCH_MESSAGE, vector.length, dimensionSize.length);
<br> }
<br>
<br> Object lastDimension = multiDimensionalComplexArray;
<br>@@ -694,15 +706,13 @@
<br> if (vector == null) {
<br> if (dimensionSize.length > 0) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "some dimensions don't match: {0} != {1}",
<br>- 0, dimensionSize.length);
<br>+ DIMENSION_MISMATCH_MESSAGE, 0, dimensionSize.length);
<br> }
<br> return null;
<br> }
<br> if (vector.length != dimensionSize.length) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "some dimensions don't match: {0} != {1}",
<br>- vector.length,dimensionSize.length);
<br>+ DIMENSION_MISMATCH_MESSAGE, vector.length,dimensionSize.length);
<br> }
<br>
<br> Object[] lastDimension = (Object[]) multiDimensionalComplexArray;
<br>@@ -818,7 +828,7 @@
<br>
<br> if (omegaCount == 0) {
<br> throw MathRuntimeException.createIllegalStateException(
<br>- "roots of unity have not been computed yet");
<br>+ MISSING_ROOTS_OF_UNITY_MESSAGE);
<br> }
<br> return isForward;
<br>
<br>@@ -882,12 +892,11 @@
<br>
<br> if (omegaCount == 0) {
<br> throw MathRuntimeException.createIllegalStateException(
<br>- "roots of unity have not been computed yet");
<br>+ MISSING_ROOTS_OF_UNITY_MESSAGE);
<br> }
<br> if ((k < 0) || (k >= omegaCount)) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "out of range root of unity index {0} (must be in [{1};{2}])",
<br>- k, 0, omegaCount - 1);
<br>+ OUT_OF_RANGE_ROOT_INDEX_MESSAGE, k, 0, omegaCount - 1);
<br> }
<br>
<br> return omegaReal[k];
<br>@@ -906,12 +915,11 @@
<br>
<br> if (omegaCount == 0) {
<br> throw MathRuntimeException.createIllegalStateException(
<br>- "roots of unity have not been computed yet");
<br>+ MISSING_ROOTS_OF_UNITY_MESSAGE);
<br> }
<br> if ((k < 0) || (k >= omegaCount)) {
<br> throw MathRuntimeException.createIllegalArgumentException(
<br>- "out of range root of unity index {0} (must be in [{1};{2}])",
<br>- k, 0, omegaCount - 1);
<br>+ OUT_OF_RANGE_ROOT_INDEX_MESSAGE, k, 0, omegaCount - 1);
<br> }
<br>
<br> return isForward ? omegaImaginaryForward[k] : omegaImaginaryInverse[k];
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToDoubleHashMap.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToDoubleHashMap.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToDoubleHashMap.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToDoubleHashMap.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToDoubleHashMap.java Sun Nov 29 21:47:51 2009
<br>@@ -50,6 +50,14 @@
<br> /** Serializable version identifier */
<br> private static final long serialVersionUID = -3646337053166149105L;
<br>
<br>+ /** Message for map modification during iteration. */
<br>+ private static final String CONCURRENT_MODIFICATION_MESSAGE =
<br>+ "map has been modified while iterating";
<br>+
<br>+ /** Message for exhausted iterator. */
<br>+ private static final String EXHAUSTED_ITERATOR_MESSAGE =
<br>+ "iterator exhausted";
<br>+
<br> /** Load factor for the map. */
<br> private static final float LOAD_FACTOR = 0.5f;
<br>
<br>@@ -526,10 +534,11 @@
<br> public int key()
<br> throws ConcurrentModificationException, NoSuchElementException {
<br> if (referenceCount != count) {
<br>- throw MathRuntimeException.createConcurrentModificationException("map has been modified while iterating");
<br>+ throw MathRuntimeException.createConcurrentModificationException(
<br>+ CONCURRENT_MODIFICATION_MESSAGE);
<br> }
<br> if (current < 0) {
<br>- throw MathRuntimeException.createNoSuchElementException("iterator exhausted");
<br>+ throw MathRuntimeException.createNoSuchElementException(EXHAUSTED_ITERATOR_MESSAGE);
<br> }
<br> return keys[current];
<br> }
<br>@@ -543,10 +552,11 @@
<br> public double value()
<br> throws ConcurrentModificationException, NoSuchElementException {
<br> if (referenceCount != count) {
<br>- throw MathRuntimeException.createConcurrentModificationException("map has been modified while iterating");
<br>+ throw MathRuntimeException.createConcurrentModificationException(
<br>+ CONCURRENT_MODIFICATION_MESSAGE);
<br> }
<br> if (current < 0) {
<br>- throw MathRuntimeException.createNoSuchElementException("iterator exhausted");
<br>+ throw MathRuntimeException.createNoSuchElementException(EXHAUSTED_ITERATOR_MESSAGE);
<br> }
<br> return values[current];
<br> }
<br>@@ -560,7 +570,8 @@
<br> throws ConcurrentModificationException, NoSuchElementException {
<br>
<br> if (referenceCount != count) {
<br>- throw MathRuntimeException.createConcurrentModificationException("map has been modified while iterating");
<br>+ throw MathRuntimeException.createConcurrentModificationException(
<br>+ CONCURRENT_MODIFICATION_MESSAGE);
<br> }
<br>
<br> // advance on step
<br>@@ -574,7 +585,7 @@
<br> } catch (ArrayIndexOutOfBoundsException e) {
<br> next = -2;
<br> if (current < 0) {
<br>- throw MathRuntimeException.createNoSuchElementException("iterator exhausted");
<br>+ throw MathRuntimeException.createNoSuchElementException(EXHAUSTED_ITERATOR_MESSAGE);
<br> }
<br> }
<br>
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java?rev=885278&r1=885277&r2=885278&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java?rev=885278&r1=885277&r2=885278&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java Sun Nov 29 21:47:51 2009
<br>@@ -53,6 +53,14 @@
<br> /** Serializable version identifier. */
<br> private static final long serialVersionUID = -9179080286849120720L;
<br>
<br>+ /** Message for map modification during iteration. */
<br>+ private static final String CONCURRENT_MODIFICATION_MESSAGE =
<br>+ "map has been modified while iterating";
<br>+
<br>+ /** Message for exhausted iterator. */
<br>+ private static final String EXHAUSTED_ITERATOR_MESSAGE =
<br>+ "iterator exhausted";
<br>+
<br> /** Load factor for the map. */
<br> private static final float LOAD_FACTOR = 0.5f;
<br>
<br>@@ -538,10 +546,11 @@
<br> public int key()
<br> throws ConcurrentModificationException, NoSuchElementException {
<br> if (referenceCount != count) {
<br>- throw MathRuntimeException.createConcurrentModificationException("map has been modified while iterating");
<br>+ throw MathRuntimeException.createConcurrentModificationException(
<br>+ CONCURRENT_MODIFICATION_MESSAGE);
<br> }
<br> if (current < 0) {
<br>- throw MathRuntimeException.createNoSuchElementException("iterator exhausted");
<br>+ throw MathRuntimeException.createNoSuchElementException(EXHAUSTED_ITERATOR_MESSAGE);
<br> }
<br> return keys[current];
<br> }
<br>@@ -555,10 +564,11 @@
<br> public T value()
<br> throws ConcurrentModificationException, NoSuchElementException {
<br> if (referenceCount != count) {
<br>- throw MathRuntimeException.createConcurrentModificationException("map has been modified while iterating");
<br>+ throw MathRuntimeException.createConcurrentModificationException(
<br>+ CONCURRENT_MODIFICATION_MESSAGE);
<br> }
<br> if (current < 0) {
<br>- throw MathRuntimeException.createNoSuchElementException("iterator exhausted");
<br>+ throw MathRuntimeException.createNoSuchElementException(EXHAUSTED_ITERATOR_MESSAGE);
<br> }
<br> return values[current];
<br> }
<br>@@ -572,7 +582,8 @@
<br> throws ConcurrentModificationException, NoSuchElementException {
<br>
<br> if (referenceCount != count) {
<br>- throw MathRuntimeException.createConcurrentModificationException("map has been modified while iterating");
<br>+ throw MathRuntimeException.createConcurrentModificationException(
<br>+ CONCURRENT_MODIFICATION_MESSAGE);
<br> }
<br>
<br> // advance on step
<br>@@ -586,7 +597,7 @@
<br> } catch (ArrayIndexOutOfBoundsException e) {
<br> next = -2;
<br> if (current < 0) {
<br>- throw MathRuntimeException.createNoSuchElementException("iterator exhausted");
<br>+ throw MathRuntimeException.createNoSuchElementException(EXHAUSTED_ITERATOR_MESSAGE);
<br> }
<br> }
<br>
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26566276
svn commit: r885268 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/EigenDecompositionImpl.java
2009-11-29T13:21:52Z
2009-11-29T13:21:52Z
luc-17
Author: luc
<br>Date: Sun Nov 29 21:21:50 2009
<br>New Revision: 885268
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885268&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885268&view=rev</a><br>Log:
<br>fixed some NaN appearing in eigenvectors when null pivots occurred in dstqds or dqds algorithms
<br>this is a partial fix for MATH-297 but not a complete one as for example computing the
<br>eigendecomposition if identity leads to three times the same vector ...
<br>JIRA: MATH-297
<br><br>Modified:
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/EigenDecompositionImpl.java
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/EigenDecompositionImpl.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/EigenDecompositionImpl.java?rev=885268&r1=885267&r2=885268&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/EigenDecompositionImpl.java?rev=885268&r1=885267&r2=885268&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/EigenDecompositionImpl.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/EigenDecompositionImpl.java Sun Nov 29 21:21:50 2009
<br>@@ -1832,14 +1832,35 @@
<br> for (int i = 0; i < nM1; ++i) {
<br> final double di = d[i];
<br> final double li = l[i];
<br>+ final double ldi = li * di;
<br> final double diP1 = di + si;
<br>- final double liP1 = li * di / diP1;
<br>+ final double liP1 = ldi / diP1;
<br> work[sixI] = si;
<br> work[sixI + 1] = diP1;
<br> work[sixI + 2] = liP1;
<br> si = li * liP1 * si - lambda;
<br> sixI += 6;
<br> }
<br>+ if (Double.isNaN(si)) {
<br>+ // one of the pivot was null, use a slower but safer version of dstqds
<br>+ si = -lambda;
<br>+ sixI = 0;
<br>+ for (int i = 0; i < nM1; ++i) {
<br>+ final double di = d[i];
<br>+ final double li = l[i];
<br>+ final double ldi = li * di;
<br>+ double diP1 = di + si;
<br>+ if (Math.abs(diP1) < minPivot) {
<br>+ diP1 = -minPivot;
<br>+ }
<br>+ final double liP1 = ldi / diP1;
<br>+ work[sixI] = si;
<br>+ work[sixI + 1] = diP1;
<br>+ work[sixI + 2] = liP1;
<br>+ si = li * ((liP1 == 0) ? li * di : liP1 * si) - lambda;
<br>+ sixI += 6;
<br>+ }
<br>+ }
<br> work[6 * nM1 + 1] = d[nM1] + si;
<br> work[6 * nM1] = si;
<br> }
<br>@@ -1868,6 +1889,25 @@
<br> pi = pi * t - lambda;
<br> sixI -= 6;
<br> }
<br>+ if (Double.isNaN(pi)) {
<br>+ // one of the pivot was null, use a slower but safer version of dqds
<br>+ pi = d[nM1] - lambda;
<br>+ sixI = 6 * (nM1 - 1);
<br>+ for (int i = nM1 - 1; i >= 0; --i) {
<br>+ final double di = d[i];
<br>+ final double li = l[i];
<br>+ double diP1 = di * li * li + pi;
<br>+ if (Math.abs(diP1) < minPivot) {
<br>+ diP1 = -minPivot;
<br>+ }
<br>+ final double t = di / diP1;
<br>+ work[sixI + 9] = pi;
<br>+ work[sixI + 10] = diP1;
<br>+ work[sixI + 5] = li * t;
<br>+ pi = ((t == 0) ? di : pi * t) - lambda;
<br>+ sixI -= 6;
<br>+ }
<br>+ }
<br> work[3] = pi;
<br> work[4] = pi;
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26565513
svn commit: r885261 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java
2009-11-29T12:07:02Z
2009-11-29T12:07:02Z
psteitz
Author: psteitz
<br>Date: Sun Nov 29 20:07:02 2009
<br>New Revision: 885261
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885261&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885261&view=rev</a><br>Log:
<br>Improved javadoc. Added comment per JIRA: DBCP-307
<br><br>Modified:
<br> commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java
<br><br>Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java?rev=885261&r1=885260&r2=885261&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java?rev=885261&r1=885260&r2=885261&view=diff</a><br>==============================================================================
<br>--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java (original)
<br>+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java Sun Nov 29 20:07:02 2009
<br>@@ -73,8 +73,8 @@
<br>
<br>
<br> /**
<br>- * Close and free all {@link PreparedStatement}s or {@link CallableStatement} from my pool, and
<br>- * close my underlying connection.
<br>+ * Close and free all {@link PreparedStatement}s or {@link CallableStatement} from the pool, and
<br>+ * close the underlying connection.
<br> */
<br> public synchronized void close() throws SQLException {
<br> if(null != _pstmtPool) {
<br>@@ -94,7 +94,8 @@
<br> }
<br>
<br> /**
<br>- * Create or obtain a {@link PreparedStatement} from my pool.
<br>+ * Create or obtain a {@link PreparedStatement} from the pool.
<br>+ * @param sql the sql string used to define the PreparedStatement
<br> * @return a {@link PoolablePreparedStatement}
<br> */
<br> public PreparedStatement prepareStatement(String sql) throws SQLException {
<br>@@ -114,7 +115,10 @@
<br> }
<br>
<br> /**
<br>- * Create or obtain a {@link PreparedStatement} from my pool.
<br>+ * Create or obtain a {@link PreparedStatement} from the pool.
<br>+ * @param sql the sql string used to define the PreparedStatement
<br>+ * @param resultSetType result set type
<br>+ * @param resultSetConcurrency result set concurrency
<br> * @return a {@link PoolablePreparedStatement}
<br> */
<br> public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
<br>@@ -135,7 +139,6 @@
<br>
<br> /**
<br> * Create or obtain a {@link CallableStatement} from the pool.
<br>- *
<br> * @param sql the sql string used to define the CallableStatement
<br> * @return a {@link PoolableCallableStatement}
<br> * @throws SQLException
<br>@@ -155,8 +158,9 @@
<br>
<br> /**
<br> * Create or obtain a {@link CallableStatement} from the pool.
<br>- *
<br> * @param sql the sql string used to define the CallableStatement
<br>+ * @param resultSetType result set type
<br>+ * @param resultSetConcurrency result set concurrency
<br> * @return a {@link PoolableCallableStatement}
<br> * @throws SQLException
<br> * @since 1.3
<br>@@ -202,6 +206,9 @@
<br>
<br> /**
<br> * Create a PStmtKey for the given arguments.
<br>+ * @param sql the sql string used to define the statement
<br>+ * @param resultSetType result set type
<br>+ * @param resultSetConcurrency result set concurrency
<br> */
<br> protected Object createKey(String sql, int resultSetType, int resultSetConcurrency) {
<br> String catalog = null;
<br>@@ -213,6 +220,10 @@
<br>
<br> /**
<br> * Create a PStmtKey for the given arguments.
<br>+ * @param sql the sql string used to define the statement
<br>+ * @param resultSetType result set type
<br>+ * @param resultSetConcurrency result set concurrency
<br>+ * @param stmtType statement type - either {@link #STATEMENT_CALLABLESTMT} or {@link #STATEMENT_PREPAREDSTMT}
<br> */
<br> protected Object createKey(String sql, int resultSetType, int resultSetConcurrency, byte stmtType) {
<br> String catalog = null;
<br>@@ -224,6 +235,7 @@
<br>
<br> /**
<br> * Create a PStmtKey for the given arguments.
<br>+ * @param sql the sql string used to define the statement
<br> */
<br> protected Object createKey(String sql) {
<br> String catalog = null;
<br>@@ -235,6 +247,8 @@
<br>
<br> /**
<br> * Create a PStmtKey for the given arguments.
<br>+ * @param sql the sql string used to define the statement
<br>+ * @param stmtType statement type - either {@link #STATEMENT_CALLABLESTMT} or {@link #STATEMENT_PREPAREDSTMT}
<br> */
<br> protected Object createKey(String sql, byte stmtType) {
<br> String catalog = null;
<br>@@ -272,7 +286,7 @@
<br> } else {
<br> return new PoolableCallableStatement(getDelegate().prepareCall( key._sql), key, _pstmtPool, this);
<br> }
<br>- }else {
<br>+ } else { // Both _resultSetType and _resultSetConcurrency are non-null here (both or neither are set by constructors)
<br> if(key._stmtType == STATEMENT_PREPAREDSTMT) {
<br> return new PoolablePreparedStatement(getDelegate().prepareStatement(
<br> key._sql, key._resultSetType.intValue(),key._resultSetConcurrency.intValue()), key, _pstmtPool, this);
<br>@@ -406,7 +420,7 @@
<br> public boolean equals(Object that) {
<br> try {
<br> PStmtKey key = (PStmtKey)that;
<br>- return( ((null == _sql && null == key._sql) || _sql.equals(key._sql)) &&
<br>+ return( ((null == _sql && null == key._sql) || _sql.equals(key._sql)) &&
<br> ((null == _catalog && null == key._catalog) || _catalog.equals(key._catalog)) &&
<br> ((null == _resultSetType && null == key._resultSetType) || _resultSetType.equals(key._resultSetType)) &&
<br> ((null == _resultSetConcurrency && null == key._resultSetConcurrency) || _resultSetConcurrency.equals(key._resultSetConcurrency)) &&
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26559679
svn commit: r885195 - /commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java
2009-11-28T22:30:24Z
2009-11-28T22:30:24Z
Paul Benedict-2
Author: pbenedict
<br>Date: Sun Nov 29 06:30:23 2009
<br>New Revision: 885195
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885195&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885195&view=rev</a><br>Log:
<br>LANG-508: Allow exception message parameters as varargs, employ String#format to format exception message, full documentation update
<br><br>Modified:
<br> commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java
<br><br>Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java?rev=885195&r1=885194&r2=885195&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java?rev=885195&r1=885194&r2=885195&view=diff</a><br>==============================================================================
<br>--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java (original)
<br>+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/Validate.java Sun Nov 29 06:30:23 2009
<br>@@ -21,25 +21,46 @@
<br> import java.util.Map;
<br>
<br> /**
<br>- * <p>Assists in validating arguments.</p>
<br>- *
<br>- * <p>The class is based along the lines of JUnit. If an argument value is
<br>- * deemed invalid, an IllegalArgumentException is thrown. For example:</p>
<br>+ * <p>This class assists in validating arguments. The validation methods are
<br>+ * based along the following principles:
<br>+ * <ul>
<br>+ * <li>An invalid <code>null</code> argument causes a {@link NullPointerException}.</li>
<br>+ * <li>A non-<code>null</code> argument causes an {@link IllegalArgumentException}.</li>
<br>+ * <li>An invalid index into an array/collection/map/string causes an {@link IndexOutOfBoundsException}.</li>
<br>+ * </ul>
<br>+ *
<br>+ * <p>All exceptions messages are <a href="<a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/Formatter.html#syntax" target="_top" rel="nofollow">http://java.sun.com/j2se/1.5.0/docs/api/java/util/Formatter.html#syntax</a>">format strings</a>
<br>+ * as defined by the Java platform. For example:</p>
<br> *
<br> * <pre>
<br>- * Validate.isTrue( i > 0, "The value must be greater than zero: ", i);
<br>- * Validate.notNull( surname, "The surname must not be null");
<br>+ * Validate.isTrue(i > 0, "The value must be greater than zero: %d", i);
<br>+ * Validate.notNull(surname, "The surname must not be %s", null);
<br> * </pre>
<br>- *
<br>+ *
<br> * @author Apache Software Foundation
<br> * @author <a href="mailto:<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26559679&i=0" target="_top" rel="nofollow">ola.berg@...</a>">Ola Berg</a>
<br> * @author Gary Gregory
<br> * @author Norm Deane
<br>- * @since 2.0
<br>+ * @author Paul Benedict
<br> * @version $Id$
<br>+ * @see java.lang.String#format(String, Object...)
<br>+ * @since 2.0
<br> */
<br> public class Validate {
<br>
<br>+ private static final String DEFAULT_IS_NULL_EXCEPTION_MESSAGE = "The validated object is null";
<br>+ private static final String DEFAULT_IS_TRUE_EXCEPTION_MESSAGE = "The validated expression is false";
<br>+ private static final String DEFAULT_NO_NULL_ELEMENTS_ARRAY_EXCEPTION_MESSAGE = "The validated array contains null element at index: %d";
<br>+ private static final String DEFAULT_NO_NULL_ELEMENTS_COLLECTION_EXCEPTION_MESSAGE = "The validated collection contains null element at index: %d";
<br>+ private static final String DEFAULT_NOT_BLANK_EXCEPTION_MESSAGE = "The validated character sequence is blank";
<br>+ private static final String DEFAULT_NOT_EMPTY_ARRAY_EXCEPTION_MESSAGE = "The validated array is empty";
<br>+ private static final String DEFAULT_NOT_EMPTY_CHAR_SEQUENCE_EXCEPTION_MESSAGE = "The validated character sequence is empty";
<br>+ private static final String DEFAULT_NOT_EMPTY_COLLECTION_EXCEPTION_MESSAGE = "The validated collection is empty";
<br>+ private static final String DEFAULT_NOT_EMPTY_MAP_EXCEPTION_MESSAGE = "The validated map is empty";
<br>+ private static final String DEFAULT_VALID_INDEX_ARRAY_EXCEPTION_MESSAGE = "The validated array index is invalid: %d";
<br>+ private static final String DEFAULT_VALID_INDEX_CHAR_SEQUENCE_EXCEPTION_MESSAGE = "The validated character sequence is invalid: %d";
<br>+ private static final String DEFAULT_VALID_INDEX_COLLECTION_EXCEPTION_MESSAGE = "The validated collection index is invalid: %d";
<br>+
<br> /**
<br> * Constructor. This class should not normally be instantiated.
<br> */
<br>@@ -51,133 +72,134 @@
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the test result is <code>false</code>.</p>
<br>- *
<br>- * <p>This is used when validating according to an arbitrary boolean expression,
<br>- * such as validating a primitive number or using your own custom validation
<br>- * expression.</p>
<br>+ * <p>Validate that the argument condition is <code>true</code>; otherwise
<br>+ * throwing an exception with the specified message. This method is useful when
<br>+ * validating according to an arbitrary boolean expression, such as validating a
<br>+ * primitive number or using your own custom validation expression.</p>
<br> *
<br>- * <pre>
<br>- * Validate.isTrue( myObject.isOk(), "The object is not OK: ", myObject);
<br>- * </pre>
<br>+ * <pre>Validate.isTrue(myObject.isOk(), "The object is not OK: %s", myObject);</pre>
<br> *
<br> * <p>For performance reasons, the object is passed as a separate parameter and
<br>- * appended to the message string only in the case of an error.</p>
<br>+ * appended to the exception message only in the case of an error.</p>
<br> *
<br>- * @param expression a boolean expression
<br>- * @param message the exception message you would like to see if the
<br>- * expression is <code>false</code>
<br>- * @param value the value to append to the message in case of error
<br>+ * @param expression the boolean expression to check
<br>+ * @param message the exception message if invalid
<br>+ * @param value the value to append to the message when invalid
<br> * @throws IllegalArgumentException if expression is <code>false</code>
<br>+ * @see #isTrue(boolean)
<br>+ * @see #isTrue(boolean, String, long)
<br>+ * @see #isTrue(boolean, String, double)
<br>+ * @see #isTrue(boolean, String, Object...)
<br> */
<br> public static void isTrue(boolean expression, String message, Object value) {
<br> if (expression == false) {
<br>- throw new IllegalArgumentException(message + value);
<br>+ throw new IllegalArgumentException(String.format(message, value));
<br> }
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the test result is <code>false</code>.</p>
<br>- *
<br>- * <p>This is used when validating according to an arbitrary boolean expression,
<br>- * such as validating a primitive number or using your own custom validation
<br>- * expression.</p>
<br>+ * <p>Validate that the argument condition is <code>true</code>; otherwise
<br>+ * throwing an exception with the specified message. This method is useful when
<br>+ * validating according to an arbitrary boolean expression, such as validating a
<br>+ * primitive number or using your own custom validation expression.</p>
<br> *
<br>- * <pre>
<br>- * Validate.isTrue( i > 0, "The value must be greater than zero: ", i);
<br>- * </pre>
<br>+ * <pre>Validate.isTrue(i > 0.0, "The value must be greater than zero: %d", i);</pre>
<br> *
<br> * <p>For performance reasons, the long value is passed as a separate parameter and
<br>- * appended to the message string only in the case of an error.</p>
<br>+ * appended to the exception message only in the case of an error.</p>
<br> *
<br>- * @param expression a boolean expression
<br>- * @param message the exception message you would like to see if the expression is <code>false</code>
<br>- * @param value the value to append to the message in case of error
<br>+ * @param expression the boolean expression to check
<br>+ * @param message the exception message if invalid
<br>+ * @param value the value to append to the message when invalid
<br> * @throws IllegalArgumentException if expression is <code>false</code>
<br>+ * @see #isTrue(boolean)
<br>+ * @see #isTrue(boolean, String, double)
<br>+ * @see #isTrue(boolean, String, Object)
<br>+ * @see #isTrue(boolean, String, Object...)
<br> */
<br> public static void isTrue(boolean expression, String message, long value) {
<br> if (expression == false) {
<br>- throw new IllegalArgumentException(message + value);
<br>+ throw new IllegalArgumentException(String.format(message, value));
<br> }
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the test result is <code>false</code>.</p>
<br>- *
<br>- * <p>This is used when validating according to an arbitrary boolean expression,
<br>- * such as validating a primitive number or using your own custom validation
<br>- * expression.</p>
<br>+ * <p>Validate that the argument condition is <code>true</code>; otherwise
<br>+ * throwing an exception with the specified message. This method is useful when
<br>+ * validating according to an arbitrary boolean expression, such as validating a
<br>+ * primitive number or using your own custom validation expression.</p>
<br> *
<br>- * <pre>
<br>- * Validate.isTrue( d > 0.0, "The value must be greater than zero: ", d);
<br>- * </pre>
<br>+ * <pre>Validate.isTrue(d > 0.0, "The value must be greater than zero: %s", d);</pre>
<br> *
<br> * <p>For performance reasons, the double value is passed as a separate parameter and
<br>- * appended to the message string only in the case of an error.</p>
<br>+ * appended to the exception message only in the case of an error.</p>
<br> *
<br>- * @param expression a boolean expression
<br>- * @param message the exception message you would like to see if the expression
<br>- * is <code>false</code>
<br>- * @param value the value to append to the message in case of error
<br>+ * @param expression the boolean expression to check
<br>+ * @param message the exception message if invalid
<br>+ * @param value the value to append to the message when invalid
<br> * @throws IllegalArgumentException if expression is <code>false</code>
<br>+ * @see #isTrue(boolean)
<br>+ * @see #isTrue(boolean, String, long)
<br>+ * @see #isTrue(boolean, String, Object)
<br>+ * @see #isTrue(boolean, String, Object...)
<br> */
<br> public static void isTrue(boolean expression, String message, double value) {
<br> if (expression == false) {
<br>- throw new IllegalArgumentException(message + value);
<br>+ throw new IllegalArgumentException(String.format(message, value));
<br> }
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the test result is <code>false</code>.</p>
<br>- *
<br>- * <p>This is used when validating according to an arbitrary boolean expression,
<br>- * such as validating a primitive number or using your own custom validation
<br>- * expression.</p>
<br>+ * <p>Validate that the argument condition is <code>true</code>; otherwise
<br>+ * throwing an exception with the specified message. This method is useful when
<br>+ * validating according to an arbitrary boolean expression, such as validating a
<br>+ * primitive number or using your own custom validation expression.</p>
<br> *
<br> * <pre>
<br>- * Validate.isTrue( (i > 0), "The value must be greater than zero");
<br>- * Validate.isTrue( myObject.isOk(), "The object is not OK");
<br>- * </pre>
<br>+ * Validate.isTrue(i >= min && i <= max, "The value must be between %d and %d", min, max);
<br>+ * Validate.isTrue(myObject.isOk(), "The object is not okay");</pre>
<br> *
<br> * <p>For performance reasons, the message string should not involve a string append,
<br> * instead use the {@link #isTrue(boolean, String, Object)} method.</p>
<br> *
<br>- * @param expression a boolean expression
<br>- * @param message the exception message you would like to see if the expression
<br>- * is <code>false</code>
<br>+ * @param expression the boolean expression to check
<br>+ * @param message the exception message if invalid
<br>+ * @param values the optional values for the formatted exception message
<br> * @throws IllegalArgumentException if expression is <code>false</code>
<br>+ * @see #isTrue(boolean)
<br>+ * @see #isTrue(boolean, String, long)
<br>+ * @see #isTrue(boolean, String, double)
<br>+ * @see #isTrue(boolean, String, Object)
<br> */
<br>- public static void isTrue(boolean expression, String message) {
<br>+ public static void isTrue(boolean expression, String message, Object... values) {
<br> if (expression == false) {
<br>- throw new IllegalArgumentException(message);
<br>+ throw new IllegalArgumentException(String.format(message, values));
<br> }
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the test result is <code>false</code>.</p>
<br>- *
<br>- * <p>This is used when validating according to an arbitrary boolean expression,
<br>- * such as validating a primitive number or using your own custom validation
<br>- * expression.</p>
<br>+ * <p>Validate that the argument condition is <code>true</code>; otherwise
<br>+ * throwing an exception. This method is useful when validating according
<br>+ * to an arbitrary boolean expression, such as validating a
<br>+ * primitive number or using your own custom validation expression.</p>
<br> *
<br> * <pre>
<br>- * Validate.isTrue( i > 0 );
<br>- * Validate.isTrue( myObject.isOk() );
<br>- * </pre>
<br>+ * Validate.isTrue(i > 0);
<br>+ * Validate.isTrue(myObject.isOk());</pre>
<br> *
<br>- * <p>The message in the exception is 'The validated expression is false'.</p>
<br>+ * <p>The message of the exception is "The validated expression is
<br>+ * false".</p>
<br> *
<br>- * @param expression a boolean expression
<br>+ * @param expression the boolean expression to check
<br> * @throws IllegalArgumentException if expression is <code>false</code>
<br>+ * @see #isTrue(boolean, String, long)
<br>+ * @see #isTrue(boolean, String, double)
<br>+ * @see #isTrue(boolean, String, Object)
<br>+ * @see #isTrue(boolean, String, Object...)
<br> */
<br> public static void isTrue(boolean expression) {
<br> if (expression == false) {
<br>- throw new IllegalArgumentException("The validated expression is false");
<br>+ throw new IllegalArgumentException(DEFAULT_IS_TRUE_EXCEPTION_MESSAGE);
<br> }
<br> }
<br>
<br>@@ -185,512 +207,568 @@
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument is <code>null</code>.</p>
<br>+ * <p>Validate that the specified argument is not <code>null</code>;
<br>+ * otherwise throwing an exception.
<br> *
<br>- * <pre>
<br>- * Validate.notNull(myObject, "The object must not be null");
<br>- * </pre>
<br>+ * <pre>Validate.notNull(myObject, "The object must not be null");</pre>
<br>+ *
<br>+ * <p>The message of the exception is "The validated object is
<br>+ * null".</p>
<br> *
<br>- * @param object the object to check is not <code>null</code>
<br>- * @param message the exception message you would like to see
<br>- * if the object is <code>null</code>
<br>- * @return the input object, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the object is <code>null</code>
<br>+ * @param <T> the object type
<br>+ * @param object the object to check
<br>+ * @return the validated object (never <code>null</code> for method chaining)
<br>+ * @throws NullPointerException if the object is <code>null</code>
<br>+ * @see #notNull(Object, String, Object...)
<br> */
<br>- public static <T> T notNull(T object, String message) {
<br>- if (object == null) {
<br>- throw new IllegalArgumentException(message);
<br>- }
<br>- return object;
<br>+ public static <T> T notNull(T object) {
<br>+ return notNull(object, DEFAULT_IS_NULL_EXCEPTION_MESSAGE);
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument is <code>null</code>.</p>
<br>- *
<br>- * <pre>
<br>- * Validate.notNull(myObject);
<br>- * </pre>
<br>+ * <p>Validate that the specified argument is not <code>null</code>;
<br>+ * otherwise throwing an exception with the specified message.
<br> *
<br>- * <p>The message in the exception is 'The validated object is null'.</p>
<br>+ * <pre>Validate.notNull(myObject, "The object must not be null");</pre>
<br> *
<br>- * @param object the object to check is not <code>null</code>
<br>- * @return the input object, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the object is <code>null</code>
<br>+ * @param <T> the object type
<br>+ * @param object the object to check
<br>+ * @param message the exception message if invalid
<br>+ * @param values the optional values for the formatted exception message
<br>+ * @return the validated object (never <code>null</code> for method chaining)
<br>+ * @throws NullPointerException if the object is <code>null</code>
<br>+ * @see #notNull(Object)
<br> */
<br>- public static <T> T notNull(T object) {
<br>- return notNull(object, "The validated object is null");
<br>+ public static <T> T notNull(T object, String message, Object... values) {
<br>+ if (object == null) {
<br>+ throw new NullPointerException(String.format(message, values));
<br>+ }
<br>+ return object;
<br> }
<br>
<br> // notEmpty array
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument array is empty (<code>null</code> or no elements).</p>
<br>- *
<br>- * <pre>
<br>- * Validate.notEmpty(myArray, "The array must not be empty");
<br>- * </pre>
<br>- *
<br>- * @param array the array to check is not empty
<br>- * @param message the exception message you would like to see if the array is empty
<br>- * @return the input array, never <code>null</code> or empty, for chaining
<br>+ * <p>Validate that the specified argument array is neither <code>null</code>
<br>+ * nor a length of zero (no elements); otherwise throwing an exception
<br>+ * with the specified message.
<br>+ *
<br>+ * <pre>Validate.notEmpty(myArray, "The array must not be empty");</pre>
<br>+ *
<br>+ * @param <T> the array type
<br>+ * @param array the array to check
<br>+ * @param message the exception message if invalid
<br>+ * @return the validated array (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the array is <code>null</code>
<br> * @throws IllegalArgumentException if the array is empty
<br>+ * @see #notEmpty(Object[])
<br> */
<br>- public static <T> T[] notEmpty(T[] array, String message) {
<br>- if (array == null || array.length == 0) {
<br>- throw new IllegalArgumentException(message);
<br>+ public static <T> T[] notEmpty(T[] array, String message, Object... values) {
<br>+ if (array == null) {
<br>+ throw new NullPointerException(String.format(message, values));
<br>+ }
<br>+ if (array.length == 0) {
<br>+ throw new IllegalArgumentException(String.format(message, values));
<br> }
<br> return array;
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument array is empty (<code>null</code> or no elements).</p>
<br>- *
<br>- * <pre>
<br>- * Validate.notEmpty(myArray);
<br>- * </pre>
<br>+ * <p>Validate that the specified argument array is neither <code>null</code>
<br>+ * nor a length of zero (no elements); otherwise throwing an exception.
<br> *
<br>- * <p>The message in the exception is 'The validated array is empty'.
<br>+ * <pre>Validate.notEmpty(myArray);</pre>
<br>+ *
<br>+ * <p>The message in the exception is "The validated array is
<br>+ * empty".
<br> *
<br>- * @param array the array to check is not empty
<br>- * @return the input array, never <code>null</code> or empty, for chaining
<br>+ * @param <T> the array type
<br>+ * @param array the array to check
<br>+ * @return the validated array (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the array is <code>null</code>
<br> * @throws IllegalArgumentException if the array is empty
<br>+ * @see #notEmpty(Object[], String, Object...)
<br> */
<br> public static <T> T[] notEmpty(T[] array) {
<br>- return notEmpty(array, "The validated array is empty");
<br>+ return notEmpty(array, DEFAULT_NOT_EMPTY_ARRAY_EXCEPTION_MESSAGE);
<br> }
<br>
<br> // notEmpty collection
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument Collection is empty (<code>null</code> or no elements).</p>
<br>- *
<br>- * <pre>
<br>- * Validate.notEmpty(myCollection, "The collection must not be empty");
<br>- * </pre>
<br>- *
<br>- * @param collection the collection to check is not empty
<br>- * @param message the exception message you would like to see if the collection is empty
<br>- * @return the input collection, never <code>null</code> or empty, for chaining
<br>+ * <p>Validate that the specified argument collection is neither <code>null</code>
<br>+ * nor a size of zero (no elements); otherwise throwing an exception
<br>+ * with the specified message.
<br>+ *
<br>+ * <pre>Validate.notEmpty(myCollection, "The collection must not be empty");</pre>
<br>+ *
<br>+ * @param <T> the collection type
<br>+ * @param collection the collection to check
<br>+ * @param message the exception message if invalid
<br>+ * @return the validated collection (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the collection is <code>null</code>
<br> * @throws IllegalArgumentException if the collection is empty
<br>+ * @see #notEmpty(Object[])
<br> */
<br>- public static <T extends Collection<?>> T notEmpty(T collection, String message) {
<br>- if (collection == null || collection.size() == 0) {
<br>- throw new IllegalArgumentException(message);
<br>+ public static <T extends Collection<?>> T notEmpty(T collection, String message, Object... values) {
<br>+ if (collection == null) {
<br>+ throw new NullPointerException(String.format(message, values));
<br>+ }
<br>+ if (collection.size() == 0) {
<br>+ throw new IllegalArgumentException(String.format(message, values));
<br> }
<br> return collection;
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument Collection is empty (<code>null</code> or no elements).</p>
<br>- *
<br>- * <pre>
<br>- * Validate.notEmpty(myCollection);
<br>- * </pre>
<br>+ * <p>Validate that the specified argument collection is neither <code>null</code>
<br>+ * nor a size of zero (no elements); otherwise throwing an exception.
<br> *
<br>- * <p>The message in the exception is 'The validated collection is empty'.</p>
<br>+ * <pre>Validate.notEmpty(myCollection);</pre>
<br>+ *
<br>+ * <p>The message in the exception is "The validated collection is
<br>+ * empty".</p>
<br> *
<br>- * @param collection the collection to check is not empty
<br>- * @return the input collection, never <code>null</code> or empty, for chaining
<br>+ * @param <T> the collection type
<br>+ * @param collection the collection to check
<br>+ * @return the validated collection (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the collection is <code>null</code>
<br> * @throws IllegalArgumentException if the collection is empty
<br>+ * @see #notEmpty(Collection, String, Object...)
<br> */
<br> public static <T extends Collection<?>> T notEmpty(T collection) {
<br>- return notEmpty(collection, "The validated collection is empty");
<br>+ return notEmpty(collection, DEFAULT_NOT_EMPTY_COLLECTION_EXCEPTION_MESSAGE);
<br> }
<br>
<br> // notEmpty map
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument Map is empty (<code>null</code> or no elements).</p>
<br>- *
<br>- * <pre>
<br>- * Validate.notEmpty(myMap, "The map must not be empty");
<br>- * </pre>
<br>- *
<br>- * @param map the map to check is not empty
<br>- * @param message the exception message you would like to see if the map is empty
<br>- * @return the input map, never <code>null</code> or empty, for chaining
<br>+ * <p>Validate that the specified argument map is neither <code>null</code>
<br>+ * nor a size of zero (no elements); otherwise throwing an exception
<br>+ * with the specified message.
<br>+ *
<br>+ * <pre>Validate.notEmpty(myMap, "The map must not be empty");</pre>
<br>+ *
<br>+ * @param <T> the map type
<br>+ * @param map the map to check
<br>+ * @param message the exception message if invalid
<br>+ * @return the validated map (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the map is <code>null</code>
<br> * @throws IllegalArgumentException if the map is empty
<br>+ * @see #notEmpty(Object[])
<br> */
<br>- public static <T extends Map<?, ?>> T notEmpty(T map, String message) {
<br>- if (map == null || map.size() == 0) {
<br>- throw new IllegalArgumentException(message);
<br>+ public static <T extends Map<?, ?>> T notEmpty(T map, String message, Object... values) {
<br>+ if (map == null) {
<br>+ throw new NullPointerException(String.format(message, values));
<br>+ }
<br>+ if (map.size() == 0) {
<br>+ throw new IllegalArgumentException(String.format(message, values));
<br> }
<br> return map;
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument Map is empty (<code>null</code> or no elements).</p>
<br>- *
<br>- * <pre>
<br>- * Validate.notEmpty(myMap);
<br>- * </pre>
<br>+ * <p>Validate that the specified argument map is neither <code>null</code>
<br>+ * nor a size of zero (no elements); otherwise throwing an exception.
<br> *
<br>- * <p>The message in the exception is 'The validated map is empty'.</p>
<br>+ * <pre>Validate.notEmpty(myMap);</pre>
<br>+ *
<br>+ * <p>The message in the exception is "The validated map is
<br>+ * empty".</p>
<br> *
<br>- * @param map the map to check is not empty
<br>- * @return the input map, never <code>null</code> or empty, for chaining
<br>+ * @param <T> the map type
<br>+ * @param map the map to check
<br>+ * @return the validated map (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the map is <code>null</code>
<br> * @throws IllegalArgumentException if the map is empty
<br>+ * @see #notEmpty(Map, String, Object...)
<br> */
<br> public static <T extends Map<?, ?>> T notEmpty(T map) {
<br>- return notEmpty(map, "The validated map is empty");
<br>+ return notEmpty(map, DEFAULT_NOT_EMPTY_MAP_EXCEPTION_MESSAGE);
<br> }
<br>
<br> // notEmpty string
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument String is empty (<code>null</code> or zero length).</p>
<br>+ * <p>Validate that the specified argument character sequence is
<br>+ * neither <code>null</code> nor a length of zero (no characters);
<br>+ * otherwise throwing an exception with the specified message.
<br> *
<br>- * <pre>
<br>- * Validate.notEmpty(myString, "The string must not be empty");
<br>- * </pre>
<br>+ * <pre>Validate.notEmpty(myString, "The string must not be empty");</pre>
<br> *
<br>- * @param string the string to check is not empty
<br>- * @param message the exception message you would like to see if the string is empty
<br>- * @return the input string, never <code>null</code> or empty, for chaining
<br>- * @throws IllegalArgumentException if the string is empty
<br>+ * @param <T> the character sequence type
<br>+ * @param chars the character sequence to check
<br>+ * @param message the exception message if invalid
<br>+ * @return the validated character sequence (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the character sequence is <code>null</code>
<br>+ * @throws IllegalArgumentException if the character sequence is empty
<br>+ * @see #notEmpty(CharSequence)
<br> */
<br>- public static <T extends CharSequence> T notEmpty(T string, String message) {
<br>- if (string == null || string.length() == 0) {
<br>- throw new IllegalArgumentException(message);
<br>+ public static <T extends CharSequence> T notEmpty(T chars, String message, Object... values) {
<br>+ if (chars == null) {
<br>+ throw new NullPointerException(String.format(message, values));
<br>+ }
<br>+ if (chars.length() == 0) {
<br>+ throw new IllegalArgumentException(String.format(message, values));
<br> }
<br>- return string;
<br>+ return chars;
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument String is empty (<code>null</code> or zero length).</p>
<br>+ * <p>Validate that the specified argument character sequence is
<br>+ * neither <code>null</code> nor a length of zero (no characters);
<br>+ * otherwise throwing an exception with the specified message.
<br> *
<br>- * <pre>
<br>- * Validate.notEmpty(myString);
<br>- * </pre>
<br>- *
<br>- * <p>The message in the exception is 'The validated string is empty'.</p>
<br>+ * <pre>Validate.notEmpty(myString);</pre>
<br>+ *
<br>+ * <p>The message in the exception is "The validated
<br>+ * character sequence is empty".</p>
<br> *
<br>- * @param string the string to check is not empty
<br>- * @return the input string, never <code>null</code> or empty, for chaining
<br>- * @throws IllegalArgumentException if the string is empty
<br>+ * @param <T> the character sequence type
<br>+ * @param chars the character sequence to check
<br>+ * @return the validated character sequence (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the character sequence is <code>null</code>
<br>+ * @throws IllegalArgumentException if the character sequence is empty
<br>+ * @see #notEmpty(CharSequence, String, Object...)
<br> */
<br>- public static <T extends CharSequence> T notEmpty(T string) {
<br>- return notEmpty(string, "The validated string is empty");
<br>+ public static <T extends CharSequence> T notEmpty(T chars) {
<br>+ return notEmpty(chars, DEFAULT_NOT_EMPTY_CHAR_SEQUENCE_EXCEPTION_MESSAGE);
<br> }
<br>
<br> // notBlank string
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument String is blank (<code>null</code>, empty or whitespace).</p>
<br>- *
<br>- * <pre>
<br>- * Validate.notBlank(myString, "The string must not be blank");
<br>- * </pre>
<br>+ * <p>Validate that the specified argument character sequence is
<br>+ * neither <code>null</code>, a length of zero (no characters), empty
<br>+ * nor whitespace; otherwise throwing an exception with the specified
<br>+ * message.
<br> *
<br>- * @param string the string to check is not blank
<br>- * @param message the exception message you would like to see if the string is blank
<br>- * @return the input string, never <code>null</code> or blank, for chaining
<br>- * @throws IllegalArgumentException if the string is blank
<br>- * @see StringUtils#isBlank(CharSequence)
<br>+ * <pre>Validate.notBlank(myString, "The string must not be blank");</pre>
<br>+ *
<br>+ * @param <T> the character sequence type
<br>+ * @param chars the character sequence to check
<br>+ * @param message the exception message if invalid
<br>+ * @return the validated character sequence (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the character sequence is <code>null</code>
<br>+ * @throws IllegalArgumentException if the character sequence is blank
<br>+ * @see #notBlank(CharSequence)
<br> */
<br>- public static <T extends CharSequence> T notBlank(T string, String message) {
<br>- if (StringUtils.isBlank(string)) {
<br>- throw new IllegalArgumentException(message);
<br>+ public static <T extends CharSequence> T notBlank(T chars, String message, Object... values) {
<br>+ if (chars == null) {
<br>+ throw new NullPointerException(String.format(message, values));
<br>+ }
<br>+ if (StringUtils.isBlank(chars)) {
<br>+ throw new IllegalArgumentException(String.format(message, values));
<br> }
<br>- return string;
<br>+ return chars;
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument String is blank (<code>null</code>, empty or whitespace).</p>
<br>+ * <p>Validate that the specified argument character sequence is
<br>+ * neither <code>null</code>, a length of zero (no characters), empty
<br>+ * nor whitespace; otherwise throwing an exception.
<br> *
<br>- * <pre>
<br>- * Validate.notBlank(myString);
<br>- * </pre>
<br>- *
<br>- * <p>The message in the exception is 'The validated string is blank'.</p>
<br>- *
<br>- * @param string the string to check is not blank
<br>- * @return the input string, never <code>null</code> or blank, for chaining
<br>- * @throws IllegalArgumentException if the string is blank
<br>- * @see StringUtils#isBlank(CharSequence)
<br>+ * <pre>Validate.notBlank(myString);</pre>
<br>+ *
<br>+ * <p>The message in the exception is "The validated character
<br>+ * sequence is blank".</p>
<br>+ *
<br>+ * @param <T> the character sequence type
<br>+ * @param chars the character sequence to check
<br>+ * @return the validated character sequence (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the character sequence is <code>null</code>
<br>+ * @throws IllegalArgumentException if the character sequence is blank
<br>+ * @see #notBlank(CharSequence, String, Object...)
<br> */
<br>- public static <T extends CharSequence> T notBlank(T string) {
<br>- return notBlank(string, "The validated string is blank");
<br>+ public static <T extends CharSequence> T notBlank(T chars) {
<br>+ return notBlank(chars, DEFAULT_NOT_BLANK_EXCEPTION_MESSAGE);
<br> }
<br>
<br> // notNullElements array
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument array has <code>null</code> elements or is
<br>- * <code>null</code>.</p>
<br>- *
<br>- * <pre>
<br>- * Validate.noNullElements(myArray, "The array must not contain null elements");
<br>- * </pre>
<br>- *
<br>- * <p>If the array is null then the message in the exception is 'The validated object is null'.</p>
<br>- *
<br>- * @param array the array to check
<br>- * @param message the exception message if the array has
<br>- * <code>null</code> elements
<br>- * @return the validated input array, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the array has <code>null</code>
<br>- * elements or is <code>null</code>
<br>+ * <p>Validate that the specified argument array is neither
<br>+ * <code>null</code> nor contains any elements that are <code>null</code>;
<br>+ * otherwise throwing an exception with the specified message.
<br>+ *
<br>+ * <pre>Validate.noNullElements(myArray, "The array contain null at position %d");</pre>
<br>+ *
<br>+ * <p>If the array is <code>null</code>, then the message in the exception
<br>+ * is "The validated object is null".</p>
<br>+ *
<br>+ * <p>If the array has a <code>null</code> element, then the iteration
<br>+ * index of the invalid element is appended to the <code>values</code>
<br>+ * argument.</p>
<br>+ *
<br>+ * @param <T> the array type
<br>+ * @param array the array to check
<br>+ * @return the validated array (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the array is <code>null</code>
<br>+ * @throws IllegalArgumentException if an element is <code>null</code>
<br>+ * @see #noNullElements(Object[])
<br> */
<br>- public static <T> T[] noNullElements(T[] array, String message) {
<br>+ public static <T> T[] noNullElements(T[] array, String message, Object... values) {
<br> Validate.notNull(array);
<br> for (int i = 0; i < array.length; i++) {
<br> if (array[i] == null) {
<br>- throw new IllegalArgumentException(message);
<br>+ Object[] values2 = ArrayUtils.add(values, i);
<br>+ throw new IllegalArgumentException(String.format(message, values2));
<br> }
<br> }
<br> return array;
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument array has <code>null</code> elements or is
<br>- * <code>null</code>.</p>
<br>- *
<br>- * <pre>
<br>- * Validate.noNullElements(myArray);
<br>- * </pre>
<br>- *
<br>- * <p>If the array has a null element the message in the exception is
<br>- * 'The validated array contains null element at index: '.</p>
<br>- *
<br>- * <p>If the array is null then the message in the exception is 'The validated object is null'.</p>
<br>- *
<br>- * @param array the array to check
<br>- * @return the validated input array, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the array has <code>null</code>
<br>- * elements or is <code>null</code>
<br>+ * <p>Validate that the specified argument array is neither
<br>+ * <code>null</code> nor contains any elements that are <code>null</code>;
<br>+ * otherwise throwing an exception.
<br>+ *
<br>+ * <pre>Validate.noNullElements(myArray);</pre>
<br>+ *
<br>+ * <p>If the array is <code>null</code>, then the message in the exception
<br>+ * is "The validated object is null".</p>
<br>+ *
<br>+ * <p>If the array has a <code>null</code> element, then the message in the
<br>+ * exception is "The validated array contains null element at index:
<br>+ * " followed by the index.</p>
<br>+ *
<br>+ * @param <T> the array type
<br>+ * @param array the array to check
<br>+ * @return the validated array (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the array is <code>null</code>
<br>+ * @throws IllegalArgumentException if an element is <code>null</code>
<br>+ * @see #noNullElements(Object[], String, Object...)
<br> */
<br> public static <T> T[] noNullElements(T[] array) {
<br>- Validate.notNull(array);
<br>- for (int i = 0; i < array.length; i++) {
<br>- if (array[i] == null) {
<br>- throw new IllegalArgumentException("The validated array contains null element at index: " + i);
<br>- }
<br>- }
<br>- return array;
<br>+ return noNullElements(array, DEFAULT_NO_NULL_ELEMENTS_ARRAY_EXCEPTION_MESSAGE);
<br> }
<br>
<br> // notNullElements collection
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument Collection has <code>null</code> elements or is
<br>- * <code>null</code>.</p>
<br>- *
<br>- * <pre>
<br>- * Validate.noNullElements(myCollection, "The collection must not contain null elements");
<br>- * </pre>
<br>- *
<br>- * <p>If the collection is null then the message in the exception is 'The validated object is null'.</p>
<br>- *
<br>- * @param collection the collection to check
<br>- * @param message the exception message if the collection has
<br>- * <code>null</code> elements
<br>- * @return the validated input collection, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the collection has
<br>- * <code>null</code> elements or is <code>null</code>
<br>+ * <p>Validate that the specified argument collection is neither
<br>+ * <code>null</code> nor contains any elements that are <code>null</code>;
<br>+ * otherwise throwing an exception with the specified message.
<br>+ *
<br>+ * <pre>Validate.noNullElements(myCollection, "The collection contains null at position %d");</pre>
<br>+ *
<br>+ * <p>If the collection is <code>null</code>, then the message in the exception
<br>+ * is "The validated object is null".</p>
<br>+ *
<br>+ * <p>If the collection has a <code>null</code> element, then the iteration
<br>+ * index of the invalid element is appended to the <code>values</code>
<br>+ * argument.</p>
<br>+ *
<br>+ * @param <T> the collection type
<br>+ * @param collection the collection to check
<br>+ * @return the validated collection (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the array is <code>null</code>
<br>+ * @throws IllegalArgumentException if an element is <code>null</code>
<br>+ * @see #noNullElements(Collection, String, Object...)
<br> */
<br>- public static <T extends Collection<?>> T noNullElements(T collection, String message) {
<br>+ public static <T extends Collection<?>> T noNullElements(T collection, String message, Object... values) {
<br> Validate.notNull(collection);
<br>- for (Iterator<?> it = collection.iterator(); it.hasNext();) {
<br>+ int i = 0;
<br>+ for (Iterator<?> it = collection.iterator(); it.hasNext(); i++) {
<br> if (it.next() == null) {
<br>- throw new IllegalArgumentException(message);
<br>+ Object[] values2 = ArrayUtils.addAll(values, i);
<br>+ throw new IllegalArgumentException(String.format(message, values2));
<br> }
<br> }
<br> return collection;
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code>
<br>- * if the argument Collection has <code>null</code> elements or is
<br>- * <code>null</code>.</p>
<br>- *
<br>- * <pre>
<br>- * Validate.noNullElements(myCollection);
<br>- * </pre>
<br>- *
<br>- * <p>The message in the exception is 'The validated collection contains null element at index: '.</p>
<br>- *
<br>- * <p>If the collection is null then the message in the exception is 'The validated object is null'.</p>
<br>- *
<br>- * @param collection the collection to check
<br>- * @return the validated input collection, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the collection has
<br>- * <code>null</code> elements or is <code>null</code>
<br>+ * <p>Validate that the specified argument collection is neither
<br>+ * <code>null</code> nor contains any elements that are <code>null</code>;
<br>+ * otherwise throwing an exception.
<br>+ *
<br>+ * <pre>Validate.noNullElements(myCollection);</pre>
<br>+ *
<br>+ * <p>If the collection is <code>null</code>, then the message in the exception
<br>+ * is "The validated object is null".</p>
<br>+ *
<br>+ * <p>If the array has a <code>null</code> element, then the message in the
<br>+ * exception is "The validated collection contains null element at index:
<br>+ * " followed by the index.</p>
<br>+ *
<br>+ * @param <T> the collection type
<br>+ * @param collection the collection to check
<br>+ * @return the validated collection (never <code>null</code> method for chaining)
<br>+ * @throws NullPointerException if the array is <code>null</code>
<br>+ * @throws IllegalArgumentException if an element is <code>null</code>
<br>+ * @see #noNullElements(Collection, String, Object...)
<br> */
<br> public static <T extends Collection<?>> T noNullElements(T collection) {
<br>- Validate.notNull(collection);
<br>- int i = 0;
<br>- for (Iterator<?> it = collection.iterator(); it.hasNext(); i++) {
<br>- if (it.next() == null) {
<br>- throw new IllegalArgumentException("The validated collection contains null element at index: " + i);
<br>- }
<br>- }
<br>- return collection;
<br>+ return noNullElements(collection, DEFAULT_NO_NULL_ELEMENTS_COLLECTION_EXCEPTION_MESSAGE);
<br> }
<br>
<br> // validIndex array
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code> if the
<br>- * index for the argument array is invalid or if the array is <code>null</code>.</p>
<br>+ * <p>Validates that the index is within the bounds of the argument
<br>+ * array; otherwise throwing an exception with the specified message.</p>
<br> *
<br>- * <pre>
<br>- * Validate.validIndex(myArray, 2, "The array index is invalid: ");
<br>- * </pre>
<br>+ * <pre>Validate.validIndex(myArray, 2, "The array index is invalid: ");</pre>
<br> *
<br>- * <p>If the array is null then the message in the exception is 'The validated object is null'.</p>
<br>- *
<br>- * @param array the array to check, not null
<br>- * @param message the exception message if the array index is invalid
<br>- * @return the validated input array, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the array index is invalid or null
<br>+ * <p>If the array is <code>null</code>, then the message of the exception
<br>+ * is "The validated object is null".</p>
<br>+ *
<br>+ * @param <T> the array type
<br>+ * @param array the array to check
<br>+ * @param index the index
<br>+ * @param message the exception message if invalid
<br>+ * @return the validated array (never <code>null</code> for method chaining)
<br>+ * @throws NullPointerException if the array is <code>null</code>
<br>+ * @throws IndexOutOfBoundsException if the index is invalid
<br>+ * @see #validIndex(Object[], int)
<br> */
<br>- public static <T> T[] validIndex(T[] array, int index, String message) {
<br>+ public static <T> T[] validIndex(T[] array, int index, String message, Object... values) {
<br> Validate.notNull(array);
<br> if (index < 0 || index >= array.length) {
<br>- throw new IllegalArgumentException(message + index);
<br>+ throw new IndexOutOfBoundsException(String.format(message, values));
<br> }
<br> return array;
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code> if the
<br>- * index for the argument array is invalid or if the array is <code>null</code>.</p>
<br>+ * <p>Validates that the index is within the bounds of the argument
<br>+ * array; otherwise throwing an exception.</p>
<br> *
<br>- * <pre>
<br>- * Validate.validIndex(myArray, 2);
<br>- * </pre>
<br>+ * <pre>Validate.validIndex(myArray, 2);</pre>
<br> *
<br>- * <p>If the array index is invalid the message in the exception is
<br>- * 'The validated array index is invalid: ' followed by the index.</p>
<br>- *
<br>- * <p>If the array is null then the message in the exception is 'The validated object is null'.</p>
<br>+ * <p>If the array is <code>null</code>, then the message of the exception
<br>+ * is "The validated object is null".</p>
<br> *
<br>- * @param array the array to check, not null
<br>- * @return the validated input array, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the array index is invalid or null
<br>+ * <p>If the index is invalid, then the message of the exception is
<br>+ * "The validated array index is invalid: " followed by the
<br>+ * index.</p>
<br>+ *
<br>+ * @param <T> the array type
<br>+ * @param array the array to check
<br>+ * @param index the index
<br>+ * @return the validated array (never <code>null</code> for method chaining)
<br>+ * @throws NullPointerException if the array is <code>null</code>
<br>+ * @throws IndexOutOfBoundsException if the index is invalid
<br>+ * @see #validIndex(Object[], int, String, Object...)
<br> */
<br> public static <T> T[] validIndex(T[] array, int index) {
<br>- return validIndex(array, index, "The validated array index is invalid: ");
<br>+ return validIndex(array, index, DEFAULT_VALID_INDEX_ARRAY_EXCEPTION_MESSAGE, index);
<br> }
<br>
<br> // validIndex collection
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code> if the
<br>- * index for the argument collection is invalid or if the collection is <code>null</code>.</p>
<br>+ * <p>Validates that the index is within the bounds of the argument
<br>+ * collection; otherwise throwing an exception with the specified message.</p>
<br> *
<br>- * <pre>
<br>- * Validate.validIndex(myCollection, 2, "The collection index is invalid: ");
<br>- * </pre>
<br>+ * <pre>Validate.validIndex(myCollection, 2, "The collection index is invalid: ");</pre>
<br> *
<br>- * <p>If the collection is null then the message in the exception is 'The validated object is null'.</p>
<br>+ * <p>If the collection is <code>null</code>, then the message of the
<br>+ * exception is "The validated object is null".</p>
<br> *
<br>- * @param coll the collection to check, not null
<br>- * @param message the exception message if the collection index is invalid
<br>- * @return the validated input collection, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the collection index is invalid or null
<br>+ * @param <T> the collection type
<br>+ * @param collection the collection to check
<br>+ * @param index the index
<br>+ * @param message the exception message if invalid
<br>+ * @return the validated collection (never <code>null</code> for chaining)
<br>+ * @throws NullPointerException if the collection is <code>null</code>
<br>+ * @throws IndexOutOfBoundsException if the index is invalid
<br>+ * @see #validIndex(Collection, int)
<br> */
<br>- public static <T extends Collection<?>> T validIndex(T coll, int index, String message) {
<br>- Validate.notNull(coll);
<br>- if (index < 0 || index >= coll.size()) {
<br>- throw new IllegalArgumentException(message + index);
<br>+ public static <T extends Collection<?>> T validIndex(T collection, int index, String message, Object... values) {
<br>+ Validate.notNull(collection);
<br>+ if (index < 0 || index >= collection.size()) {
<br>+ throw new IndexOutOfBoundsException(String.format(message, values));
<br> }
<br>- return coll;
<br>+ return collection;
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code> if the
<br>- * index for the argument collection is invalid or if the collection is <code>null</code>.</p>
<br>+ * <p>Validates that the index is within the bounds of the argument
<br>+ * collection; otherwise throwing an exception.</p>
<br> *
<br>- * <pre>
<br>- * Validate.validIndex(myCollection, 2);
<br>- * </pre>
<br>- *
<br>- * <p>If the collection index is invalid the message in the exception is
<br>- * 'The validated collection index is invalid: ' followed by the index.</p>
<br>+ * <pre>Validate.validIndex(myCollection, 2);</pre>
<br> *
<br>- * <p>If the collection is null then the message in the exception is 'The validated object is null'.</p>
<br>- *
<br>- * @param coll the collection to check, not null
<br>- * @return the validated input collection, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the collection index is invalid or null
<br>+ * <p>If the index is invalid, then the message of the exception
<br>+ * is "The validated collection index is invalid: "
<br>+ * followed by the index.</p>
<br>+ *
<br>+ * @param <T> the collection type
<br>+ * @param collection the collection to check
<br>+ * @param index the index
<br>+ * @return the validated collection (never <code>null</code> for method chaining)
<br>+ * @throws NullPointerException if the collection is <code>null</code>
<br>+ * @throws IndexOutOfBoundsException if the index is invalid
<br>+ * @see #validIndex(Collection, int, String, Object...)
<br> */
<br>- public static <T extends Collection<?>> T validIndex(T coll, int index) {
<br>- return validIndex(coll, index, "The validated collection index is invalid: ");
<br>+ public static <T extends Collection<?>> T validIndex(T collection, int index) {
<br>+ return validIndex(collection, index, DEFAULT_VALID_INDEX_COLLECTION_EXCEPTION_MESSAGE, index);
<br> }
<br>
<br> // validIndex string
<br> //---------------------------------------------------------------------------------
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code> if the
<br>- * index for the argument character sequence (including String and StringBuffer)
<br>- * is invalid or if the string is <code>null</code>.</p>
<br>+ * <p>Validates that the index is within the bounds of the argument
<br>+ * character sequence; otherwise throwing an exception with the
<br>+ * specified message.</p>
<br> *
<br>- * <pre>
<br>- * Validate.validIndex(myStr, 2, "The string index is invalid: ");
<br>- * </pre>
<br>+ * <pre>Validate.validIndex(myStr, 2, "The string index is invalid: ");</pre>
<br> *
<br>- * <p>If the string is null then the message in the exception is 'The validated object is null'.</p>
<br>+ * <p>If the character sequence is <code>null</code>, then the message
<br>+ * of the exception is "The validated object is null".</p>
<br> *
<br>- * @param str the string to check, not null
<br>- * @param message the exception message if the string index is invalid
<br>- * @return the validated input string, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the string index is invalid or null
<br>+ * @param <T> the character sequence type
<br>+ * @param chars the character sequence to check
<br>+ * @param index the index
<br>+ * @param message the exception message if invalid
<br>+ * @return the validated character sequence (never <code>null</code> for method chaining)
<br>+ * @throws NullPointerException if the character sequence is <code>null</code>
<br>+ * @throws IndexOutOfBoundsException if the index is invalid
<br>+ * @see #validIndex(CharSequence, int)
<br> */
<br>- public static <T extends CharSequence> T validIndex(T str, int index, String message) {
<br>- Validate.notNull(str);
<br>- if (index < 0 || index >= str.length()) {
<br>- throw new IllegalArgumentException(message + index);
<br>+ public static <T extends CharSequence> T validIndex(T chars, int index, String message, Object... values) {
<br>+ Validate.notNull(chars);
<br>+ if (index < 0 || index >= chars.length()) {
<br>+ throw new IndexOutOfBoundsException(String.format(message, values));
<br> }
<br>- return str;
<br>+ return chars;
<br> }
<br>
<br> /**
<br>- * <p>Validate an argument, throwing <code>IllegalArgumentException</code> if the
<br>- * index for the argument character sequence (including String and StringBuffer)
<br>- * is invalid or if the string is <code>null</code>.</p>
<br>- *
<br>- * <pre>
<br>- * Validate.validIndex(myStr, 2);
<br>- * </pre>
<br>- *
<br>- * <p>If the string index is invalid the message in the exception is
<br>- * 'The validated string index is invalid: ' followed by the index.</p>
<br>+ * <p>Validates that the index is within the bounds of the argument
<br>+ * character sequence; otherwise throwing an exception.</p>
<br>+ *
<br>+ * <pre>Validate.validIndex(myStr, 2);</pre>
<br> *
<br>- * <p>If the string is null then the message in the exception is 'The validated object is null'.</p>
<br>+ * <p>If the character sequence is <code>null</code>, then the message
<br>+ * of the exception is "The validated object is
<br>+ * null".</p>
<br>+ *
<br>+ * <p>If the index is invalid, then the message of the exception
<br>+ * is "The validated character sequence index is invalid: "
<br>+ * followed by the index.</p>
<br> *
<br>- * @param str the string to check, not null
<br>- * @return the validated input string, never <code>null</code>, for chaining
<br>- * @throws IllegalArgumentException if the string index is invalid or null
<br>+ * @param <T> the character sequence type
<br>+ * @param chars the character sequence to check
<br>+ * @param index the index
<br>+ * @return the validated character sequence (never <code>null</code> for method chaining)
<br>+ * @throws NullPointerException if the character sequence is <code>null</code>
<br>+ * @throws IndexOutOfBoundsException if the index is invalid
<br>+ * @see #validIndex(CharSequence, int, String, Object...)
<br> */
<br>- public static <T extends CharSequence> T validIndex(T str, int index) {
<br>- return validIndex(str, index, "The validated string index is invalid: ");
<br>+ public static <T extends CharSequence> T validIndex(T chars, int index) {
<br>+ return validIndex(chars, index, DEFAULT_VALID_INDEX_CHAR_SEQUENCE_EXCEPTION_MESSAGE, index);
<br> }
<br>
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26558419
svn commit: r885180 - in /commons/sandbox/flatfile/trunk: pom.xml src/site/xdoc/issue-tracking.xml
2009-11-28T16:31:39Z
2009-11-28T16:31:39Z
niallp
Author: niallp
<br>Date: Sun Nov 29 00:31:38 2009
<br>New Revision: 885180
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885180&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885180&view=rev</a><br>Log:
<br>Generate Issue Tracking page for flatfile
<br><br>Added:
<br> commons/sandbox/flatfile/trunk/src/site/xdoc/issue-tracking.xml (with props)
<br>Modified:
<br> commons/sandbox/flatfile/trunk/pom.xml
<br><br>Modified: commons/sandbox/flatfile/trunk/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/sandbox/flatfile/trunk/pom.xml?rev=885180&r1=885179&r2=885180&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/sandbox/flatfile/trunk/pom.xml?rev=885180&r1=885179&r2=885180&view=diff</a><br>==============================================================================
<br>--- commons/sandbox/flatfile/trunk/pom.xml (original)
<br>+++ commons/sandbox/flatfile/trunk/pom.xml Sun Nov 29 00:31:38 2009
<br>@@ -131,6 +131,7 @@
<br> <maven.compile.source>1.5</maven.compile.source>
<br> <maven.compile.target>1.5</maven.compile.target>
<br> <commons.componentid>flatfile</commons.componentid>
<br>+ <commons.jira.componentid>12312476</commons.jira.componentid>
<br> </properties>
<br> <reporting>
<br> <plugins>
<br>@@ -139,7 +140,7 @@
<br> <artifactId>maven-pmd-plugin</artifactId>
<br> <version>2.3</version>
<br> <configuration>
<br>- <targetJdk>1.5</targetJdk>
<br>+ <targetJdk>${maven.compile.target}</targetJdk>
<br> </configuration>
<br> </plugin>
<br> <plugin>
<br><br>Added: commons/sandbox/flatfile/trunk/src/site/xdoc/issue-tracking.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/sandbox/flatfile/trunk/src/site/xdoc/issue-tracking.xml?rev=885180&view=auto" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/sandbox/flatfile/trunk/src/site/xdoc/issue-tracking.xml?rev=885180&view=auto</a><br>==============================================================================
<br>--- commons/sandbox/flatfile/trunk/src/site/xdoc/issue-tracking.xml (added)
<br>+++ commons/sandbox/flatfile/trunk/src/site/xdoc/issue-tracking.xml Sun Nov 29 00:31:38 2009
<br>@@ -0,0 +1,100 @@
<br>+<?xml version="1.0"?>
<br>+<!--
<br>+Licensed to the Apache Software Foundation (ASF) under one or more
<br>+contributor license agreements. See the NOTICE file distributed with
<br>+this work for additional information regarding copyright ownership.
<br>+The ASF licenses this file to You under the Apache License, Version 2.0
<br>+(the "License"); you may not use this file except in compliance with
<br>+the License. You may obtain a copy of the License at
<br>+
<br>+ <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_top" rel="nofollow">http://www.apache.org/licenses/LICENSE-2.0</a><br>+
<br>+Unless required by applicable law or agreed to in writing, software
<br>+distributed under the License is distributed on an "AS IS" BASIS,
<br>+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br>+See the License for the specific language governing permissions and
<br>+limitations under the License.
<br>+-->
<br>+<!--
<br>+ +======================================================================+
<br>+ |**** ****|
<br>+ |**** THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN ****|
<br>+ |**** DO NOT EDIT DIRECTLY ****|
<br>+ |**** ****|
<br>+ +======================================================================+
<br>+ | TEMPLATE FILE: sandbox-issue-tracking-template.xml |
<br>+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
<br>+ +======================================================================+
<br>+ | |
<br>+ | 1) Re-generate using: mvn commons:sandbox-jira-page |
<br>+ | |
<br>+ | 2) Set the following properties in the component's pom: |
<br>+ | - commons.jira.componentid (required, numeric) |
<br>+ | |
<br>+ | 3) Example Properties |
<br>+ | |
<br>+ | <properties> |
<br>+ | <commons.jira.componentid>12311182</commons.jira.componentid> |
<br>+ | </properties> |
<br>+ | |
<br>+ +======================================================================+
<br>+-->
<br>+<document>
<br>+ <properties>
<br>+ <title>Commons Flatfile (Sandbox) Issue tracking</title>
<br>+ <author email="<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26558419&i=0" target="_top" rel="nofollow">dev@...</a>">Commons Documentation Team</author>
<br>+ </properties>
<br>+ <body>
<br>+
<br>+ <section name="Commons Flatfile (Sandbox) Issue tracking">
<br>+ <p>
<br>+ Commons Flatfile (Sandbox) uses <a href="<a href="http://issues.apache.org/jira/" target="_top" rel="nofollow">http://issues.apache.org/jira/</a>">ASF JIRA</a> for tracking issues.
<br>+ See the <a href="<a href="http://issues.apache.org/jira/browse/SANDBOX" target="_top" rel="nofollow">http://issues.apache.org/jira/browse/SANDBOX</a>">Sandbox JIRA project page</a>.
<br>+ </p>
<br>+
<br>+ <p>
<br>+ To use JIRA you may need to <a href="<a href="http://issues.apache.org/jira/secure/Signup!default.jspa" target="_top" rel="nofollow">http://issues.apache.org/jira/secure/Signup!default.jspa</a>">create an account</a>
<br>+ (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically
<br>+ created and you can use the <a href="<a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa" target="_top" rel="nofollow">http://issues.apache.org/jira/secure/ForgotPassword!default.jspa</a>">Forgot Password</a>
<br>+ page to get a new password).
<br>+ </p>
<br>+
<br>+ <p>
<br>+ If you would like to report a bug, or raise an enhancement request with
<br>+ Commons Flatfile (Sandbox) please do the following:
<br>+ <ol>
<br>+ <li><a href="<a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12312476&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4" target="_top" rel="nofollow">http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12312476&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4</a>">Search existing open bugs</a>.
<br>+ If you find your issue listed then please add a comment with your details.</li>
<br>+ <li><a href="mail-lists.html">Search the mailing list archive(s)</a>.
<br>+ You may find your issue or idea has already been discussed.</li>
<br>+ <li>Decide if your issue is a bug or an enhancement.</li>
<br>+ <li>Submit either a <a href="<a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310491&components=12312476&issuetype=1&priority=4&assignee=-1" target="_top" rel="nofollow">http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310491&components=12312476&issuetype=1&priority=4&assignee=-1</a>">bug report</a>
<br>+ or <a href="<a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310491&components=12312476&issuetype=4&priority=4&assignee=-1" target="_top" rel="nofollow">http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310491&components=12312476&issuetype=4&priority=4&assignee=-1</a>">enhancement request</a>.</li>
<br>+ </ol>
<br>+ </p>
<br>+
<br>+ <p>
<br>+ Please also remember these points:
<br>+ <ul>
<br>+ <li>the more information you provide, the better we can help you</li>
<br>+ <li>test cases are vital, particularly for any proposed enhancements</li>
<br>+ <li>the developers of Commons Flatfile (Sandbox) are all unpaid volunteers</li>
<br>+ </ul>
<br>+ </p>
<br>+
<br>+ <p>
<br>+ For more information on subversion and creating patches see the
<br>+ <a href="<a href="http://www.apache.org/dev/contributors.html" target="_top" rel="nofollow">http://www.apache.org/dev/contributors.html</a>">Apache Contributors Guide</a>.
<br>+ </p>
<br>+
<br>+ <p>
<br>+ You may also find these links useful:
<br>+ <ul>
<br>+ <li><a href="<a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12312476&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4" target="_top" rel="nofollow">http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12312476&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4</a>">All Open Commons Flatfile (Sandbox) bugs</a></li>
<br>+ <li><a href="<a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12312476&sorter/field=issuekey&sorter/order=DESC&status=5&status=6" target="_top" rel="nofollow">http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12312476&sorter/field=issuekey&sorter/order=DESC&status=5&status=6</a>">All Resolved Commons Flatfile (Sandbox) bugs</a></li>
<br>+ <li><a href="<a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12312476&sorter/field=issuekey&sorter/order=DESC" target="_top" rel="nofollow">http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12312476&sorter/field=issuekey&sorter/order=DESC</a>">All Commons Flatfile (Sandbox) bugs</a></li>
<br>+ </ul>
<br>+ </p>
<br>+ </section>
<br>+ </body>
<br>+</document>
<br><br>Propchange: commons/sandbox/flatfile/trunk/src/site/xdoc/issue-tracking.xml
<br>------------------------------------------------------------------------------
<br> svn:eol-style = native
<br><br>Propchange: commons/sandbox/flatfile/trunk/src/site/xdoc/issue-tracking.xml
<br>------------------------------------------------------------------------------
<br> svn:keywords = Date Author Id Revision HeadURL
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26558266
svn commit: r885179 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/SQLNestedException.java
2009-11-28T16:10:52Z
2009-11-28T16:10:52Z
niallp
Author: niallp
<br>Date: Sun Nov 29 00:10:52 2009
<br>New Revision: 885179
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885179&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885179&view=rev</a><br>Log:
<br>DBCP-310 Simplify SQLNestedException now minimum is JDK 1.4
<br><br>Modified:
<br> commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/SQLNestedException.java
<br><br>Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/SQLNestedException.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/SQLNestedException.java?rev=885179&r1=885178&r2=885179&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/SQLNestedException.java?rev=885179&r1=885178&r2=885179&view=diff</a><br>==============================================================================
<br>--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/SQLNestedException.java (original)
<br>+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/SQLNestedException.java Sun Nov 29 00:10:52 2009
<br>@@ -28,34 +28,12 @@
<br> *
<br> * @author Dirk Verbeeck
<br> * @version $Revision$ $Date$
<br>- * @deprecated Use '(SQLException) new SQLException(msg).initCause(e)' instead; this class will be removed in DBCP 1.4
<br>+ * @deprecated Use '(SQLException) new SQLException(msg).initCause(e)' instead; this class will be removed in DBCP 2.0
<br> */
<br> public class SQLNestedException extends SQLException {
<br>
<br> private static final long serialVersionUID = 1046151479543081202L;
<br>
<br>- /* Throwable.getCause detection as found in commons-lang */
<br>- private static final Method THROWABLE_CAUSE_METHOD;
<br>- static {
<br>- Method getCauseMethod;
<br>- try {
<br>- getCauseMethod = Throwable.class.getMethod("getCause", (Class[]) null);
<br>- } catch (Exception e) {
<br>- getCauseMethod = null;
<br>- }
<br>- THROWABLE_CAUSE_METHOD = getCauseMethod;
<br>- }
<br>-
<br>- private static boolean hasThrowableCauseMethod() {
<br>- return THROWABLE_CAUSE_METHOD != null;
<br>- }
<br>-
<br>- /**
<br>- * Holds the reference to the exception or error that caused
<br>- * this exception to be thrown.
<br>- */
<br>- private final Throwable cause;
<br>-
<br> /**
<br> * Constructs a new <code>SQLNestedException</code> with specified
<br> * detail message and nested <code>Throwable</code>.
<br>@@ -66,33 +44,8 @@
<br> */
<br> public SQLNestedException(String msg, Throwable cause) {
<br> super(msg);
<br>- this.cause = cause;
<br> if (cause != null){
<br>- final PrintWriter logWriter = DriverManager.getLogWriter();
<br>- if (logWriter != null) {
<br>- logWriter.print("Caused by: ");
<br>- cause.printStackTrace(logWriter);
<br>- }
<br>- }
<br>- }
<br>-
<br>- public Throwable getCause() {
<br>- return this.cause;
<br>- }
<br>-
<br>- public void printStackTrace(PrintStream s) {
<br>- super.printStackTrace(s);
<br>- if ((cause != null) && !hasThrowableCauseMethod()) {
<br>- s.print("Caused by: ");
<br>- this.cause.printStackTrace(s);
<br>- }
<br>- }
<br>-
<br>- public void printStackTrace(PrintWriter s) {
<br>- super.printStackTrace(s);
<br>- if ((cause != null) && !hasThrowableCauseMethod()) {
<br>- s.print("Caused by: ");
<br>- this.cause.printStackTrace(s);
<br>+ initCause(cause);
<br> }
<br> }
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26558255
svn commit: r885178 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java
2009-11-28T16:08:59Z
2009-11-28T16:08:59Z
niallp
Author: niallp
<br>Date: Sun Nov 29 00:08:59 2009
<br>New Revision: 885178
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885178&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885178&view=rev</a><br>Log:
<br>DBCP-311 Don't log and re-throw exceptions
<br><br>Modified:
<br> commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java
<br><br>Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java?rev=885178&r1=885177&r2=885178&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java?rev=885178&r1=885177&r2=885178&view=diff</a><br>==============================================================================
<br>--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java (original)
<br>+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java Sun Nov 29 00:08:59 2009
<br>@@ -145,8 +145,6 @@
<br> xaDataSourceClass = Class.forName(xaDataSource);
<br> } catch (Throwable t) {
<br> String message = "Cannot load XA data source class '" + xaDataSource + "'";
<br>- logWriter.println(message);
<br>- t.printStackTrace(logWriter);
<br> throw (SQLException)new SQLException(message).initCause(t);
<br> }
<br>
<br>@@ -154,8 +152,6 @@
<br> xaDataSourceInstance = (XADataSource) xaDataSourceClass.newInstance();
<br> } catch (Throwable t) {
<br> String message = "Cannot create XA data source of class '" + xaDataSource + "'";
<br>- logWriter.println(message);
<br>- t.printStackTrace(logWriter);
<br> throw (SQLException)new SQLException(message).initCause(t);
<br> }
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26554475
svn commit: r885109 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java
2009-11-28T08:16:00Z
2009-11-28T08:16:00Z
psteitz
Author: psteitz
<br>Date: Sat Nov 28 16:15:59 2009
<br>New Revision: 885109
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885109&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885109&view=rev</a><br>Log:
<br>Javadoc only. Fixed broken link.
<br><br>Modified:
<br> commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java
<br><br>Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java?rev=885109&r1=885108&r2=885109&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java?rev=885109&r1=885108&r2=885109&view=diff</a><br>==============================================================================
<br>--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java (original)
<br>+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingConnection.java Sat Nov 28 16:15:59 2009
<br>@@ -255,10 +255,11 @@
<br> /**
<br> * {@link KeyedPoolableObjectFactory} method for creating
<br> * {@link PoolablePreparedStatement}s or {@link PoolableCallableStatement}s.
<br>- * The {@link PStmtKey#_stmtType} field in the key determines whether
<br>+ * The <code>stmtType</code> field in the key determines whether
<br> * a PoolablePreparedStatement or PoolableCallableStatement is created.
<br> *
<br> * @param obj the key for the {@link PreparedStatement} to be created
<br>+ * @see #createKey(String, int, int, byte)
<br> */
<br> public Object makeObject(Object obj) throws Exception {
<br> if(null == obj || !(obj instanceof PStmtKey)) {
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26554468
svn commit: r885108 - /commons/proper/dbcp/trunk/pom.xml
2009-11-28T08:14:59Z
2009-11-28T08:14:59Z
psteitz
Author: psteitz
<br>Date: Sat Nov 28 16:14:58 2009
<br>New Revision: 885108
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885108&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885108&view=rev</a><br>Log:
<br>Changed jdk level to 1.6
<br><br>Modified:
<br> commons/proper/dbcp/trunk/pom.xml
<br><br>Modified: commons/proper/dbcp/trunk/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=885108&r1=885107&r2=885108&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=885108&r1=885107&r2=885108&view=diff</a><br>==============================================================================
<br>--- commons/proper/dbcp/trunk/pom.xml (original)
<br>+++ commons/proper/dbcp/trunk/pom.xml Sat Nov 28 16:14:58 2009
<br>@@ -214,9 +214,10 @@
<br> </dependencies>
<br>
<br> <properties>
<br>- <!-- Target Java versions are actually 1.4, 1.5 and 1.6 -->
<br>- <maven.compile.source>1.5</maven.compile.source>
<br>- <maven.compile.target>1.5</maven.compile.target>
<br>+ <!-- Target Java versions are actually 1.4, 1.5 and 1.6
<br>+ but maven build only supports 1.6 -->
<br>+ <maven.compile.source>1.6</maven.compile.source>
<br>+ <maven.compile.target>1.6</maven.compile.target>
<br> <commons.componentid>dbcp</commons.componentid>
<br> <commons.release.version>1.2.2</commons.release.version>
<br> <commons.binary.suffix></commons.binary.suffix>
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26554374
svn commit: r885104 - /commons/proper/dbcp/trunk/pom.xml
2009-11-28T08:02:57Z
2009-11-28T08:02:57Z
psteitz
Author: psteitz
<br>Date: Sat Nov 28 16:02:57 2009
<br>New Revision: 885104
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885104&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885104&view=rev</a><br>Log:
<br>Updated pool javadoc link.
<br><br>Modified:
<br> commons/proper/dbcp/trunk/pom.xml
<br><br>Modified: commons/proper/dbcp/trunk/pom.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=885104&r1=885103&r2=885104&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=885104&r1=885103&r2=885104&view=diff</a><br>==============================================================================
<br>--- commons/proper/dbcp/trunk/pom.xml (original)
<br>+++ commons/proper/dbcp/trunk/pom.xml Sat Nov 28 16:02:57 2009
<br>@@ -332,7 +332,7 @@
<br> <configuration>
<br> <links>
<br> <link><a href="http://java.sun.com/j2se/1.5.0/docs/api" target="_top" rel="nofollow">http://java.sun.com/j2se/1.5.0/docs/api</a></link>
<br>- <link><a href="http://commons.apache.org/pool/api-1.5" target="_top" rel="nofollow">http://commons.apache.org/pool/api-1.5</a></link>
<br>+ <link><a href="http://commons.apache.org/pool/api-1.5.4" target="_top" rel="nofollow">http://commons.apache.org/pool/api-1.5.4</a></link>
<br> <link><a href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api" target="_top" rel="nofollow">http://java.sun.com/j2ee/sdk_1.3/techdocs/api</a></link>
<br> </links>
<br> </configuration>
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26552232
svn commit: r885084 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java
2009-11-28T03:09:45Z
2009-11-28T03:09:45Z
niallp
Author: niallp
<br>Date: Sat Nov 28 11:09:45 2009
<br>New Revision: 885084
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885084&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885084&view=rev</a><br>Log:
<br>Use initCause() method with SQLException rather than commeting out for pre-JDK-1.6
<br><br>Modified:
<br> commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java
<br><br>Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java?rev=885084&r1=885083&r2=885084&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java?rev=885084&r1=885083&r2=885084&view=diff</a><br>==============================================================================
<br>--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java (original)
<br>+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java Sat Nov 28 11:09:45 2009
<br>@@ -147,11 +147,7 @@
<br> String message = "Cannot load XA data source class '" + xaDataSource + "'";
<br> logWriter.println(message);
<br> t.printStackTrace(logWriter);
<br>- throw new SQLException(message
<br>- /* JDBC_4_ANT_KEY_BEGIN */
<br>- , t
<br>- /* JDBC_4_ANT_KEY_END */
<br>- );
<br>+ throw (SQLException)new SQLException(message).initCause(t);
<br> }
<br>
<br> try {
<br>@@ -160,11 +156,7 @@
<br> String message = "Cannot create XA data source of class '" + xaDataSource + "'";
<br> logWriter.println(message);
<br> t.printStackTrace(logWriter);
<br>- throw new SQLException(message
<br>- /* JDBC_4_ANT_KEY_BEGIN */
<br>- , t
<br>- /* JDBC_4_ANT_KEY_END */
<br>- );
<br>+ throw (SQLException)new SQLException(message).initCause(t);
<br> }
<br> }
<br>
<br>@@ -209,11 +201,7 @@
<br> } catch (RuntimeException e) {
<br> throw e;
<br> } catch (Exception e) {
<br>- throw new SQLException("Cannot create PoolableConnectionFactory (" + e.getMessage() + ")"
<br>- /* JDBC_4_ANT_KEY_BEGIN */
<br>- , e
<br>- /* JDBC_4_ANT_KEY_END */
<br>- );
<br>+ throw (SQLException)new SQLException("Cannot create PoolableConnectionFactory (" + e.getMessage() + ")").initCause(e);
<br> }
<br> }
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26549093
svn commit: r885049 - /commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java
2009-11-27T15:27:16Z
2009-11-27T15:27:16Z
luc-17
Author: luc
<br>Date: Fri Nov 27 23:27:16 2009
<br>New Revision: 885049
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885049&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885049&view=rev</a><br>Log:
<br>removed an unneeded constant
<br><br>Modified:
<br> commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java
<br><br>Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java?rev=885049&r1=885048&r2=885049&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java?rev=885049&r1=885048&r2=885049&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java (original)
<br>+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java Fri Nov 27 23:27:16 2009
<br>@@ -128,12 +128,11 @@
<br> }));
<br> final double s3 = Math.sqrt(3.0);
<br> final double s14 = Math.sqrt(14.0);
<br>- final double s42 = Math.sqrt(42.0);
<br> final double s1553 = Math.sqrt(1553.0);
<br> RealMatrix uRef = MatrixUtils.createRealMatrix(new double[][] {
<br>- { -1.0 / s14, 5.0 / s42, 1.0 / s3 },
<br>- { -2.0 / s14, -4.0 / s42, 1.0 / s3 },
<br>- { -3.0 / s14, 1.0 / s42, -1.0 / s3 }
<br>+ { -1.0 / s14, 5.0 / (s3 * s14), 1.0 / s3 },
<br>+ { -2.0 / s14, -4.0 / (s3 * s14), 1.0 / s3 },
<br>+ { -3.0 / s14, 1.0 / (s3 * s14), -1.0 / s3 }
<br> });
<br> RealMatrix bRef = MatrixUtils.createRealMatrix(new double[][] {
<br> { -s14, s1553 / s14, 0.0 },
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26549078
svn commit: r885048 - /commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java
2009-11-27T15:24:13Z
2009-11-27T15:24:13Z
luc-17
Author: luc
<br>Date: Fri Nov 27 23:24:12 2009
<br>New Revision: 885048
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885048&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885048&view=rev</a><br>Log:
<br>added a test with a singular matrix
<br>updated class to Junit4
<br><br>Modified:
<br> commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java
<br><br>Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java?rev=885048&r1=885047&r2=885048&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java?rev=885048&r1=885047&r2=885048&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java (original)
<br>+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java Fri Nov 27 23:24:12 2009
<br>@@ -20,12 +20,10 @@
<br> import org.apache.commons.math.linear.BiDiagonalTransformer;
<br> import org.apache.commons.math.linear.MatrixUtils;
<br> import org.apache.commons.math.linear.RealMatrix;
<br>+import org.junit.Assert;
<br>+import org.junit.Test;
<br>
<br>-import junit.framework.Test;
<br>-import junit.framework.TestCase;
<br>-import junit.framework.TestSuite;
<br>-
<br>-public class BiDiagonalTransformerTest extends TestCase {
<br>+public class BiDiagonalTransformerTest {
<br>
<br> private double[][] testSquare = {
<br> { 24.0 / 25.0, 43.0 / 25.0 },
<br>@@ -39,10 +37,7 @@
<br> { -360.0 / 625.0, 192.0 / 625.0, 1756.0 / 625.0 },
<br> };
<br>
<br>- public BiDiagonalTransformerTest(String name) {
<br>- super(name);
<br>- }
<br>-
<br>+ @Test
<br> public void testDimensions() {
<br> checkdimensions(MatrixUtils.createRealMatrix(testSquare));
<br> checkdimensions(MatrixUtils.createRealMatrix(testNonSquare));
<br>@@ -53,15 +48,16 @@
<br> final int m = matrix.getRowDimension();
<br> final int n = matrix.getColumnDimension();
<br> BiDiagonalTransformer transformer = new BiDiagonalTransformer(matrix);
<br>- assertEquals(m, transformer.getU().getRowDimension());
<br>- assertEquals(m, transformer.getU().getColumnDimension());
<br>- assertEquals(m, transformer.getB().getRowDimension());
<br>- assertEquals(n, transformer.getB().getColumnDimension());
<br>- assertEquals(n, transformer.getV().getRowDimension());
<br>- assertEquals(n, transformer.getV().getColumnDimension());
<br>+ Assert.assertEquals(m, transformer.getU().getRowDimension());
<br>+ Assert.assertEquals(m, transformer.getU().getColumnDimension());
<br>+ Assert.assertEquals(m, transformer.getB().getRowDimension());
<br>+ Assert.assertEquals(n, transformer.getB().getColumnDimension());
<br>+ Assert.assertEquals(n, transformer.getV().getRowDimension());
<br>+ Assert.assertEquals(n, transformer.getV().getColumnDimension());
<br>
<br> }
<br>
<br>+ @Test
<br> public void testAEqualUSVt() {
<br> checkAEqualUSVt(MatrixUtils.createRealMatrix(testSquare));
<br> checkAEqualUSVt(MatrixUtils.createRealMatrix(testNonSquare));
<br>@@ -74,15 +70,17 @@
<br> RealMatrix b = transformer.getB();
<br> RealMatrix v = transformer.getV();
<br> double norm = u.multiply(b).multiply(v.transpose()).subtract(matrix).getNorm();
<br>- assertEquals(0, norm, 1.0e-14);
<br>+ Assert.assertEquals(0, norm, 1.0e-14);
<br> }
<br>
<br>+ @Test
<br> public void testUOrthogonal() {
<br> checkOrthogonal(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testSquare)).getU());
<br> checkOrthogonal(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testNonSquare)).getU());
<br> checkOrthogonal(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testNonSquare).transpose()).getU());
<br> }
<br>
<br>+ @Test
<br> public void testVOrthogonal() {
<br> checkOrthogonal(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testSquare)).getV());
<br> checkOrthogonal(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testNonSquare)).getV());
<br>@@ -92,9 +90,10 @@
<br> private void checkOrthogonal(RealMatrix m) {
<br> RealMatrix mTm = m.transpose().multiply(m);
<br> RealMatrix id = MatrixUtils.createRealIdentityMatrix(mTm.getRowDimension());
<br>- assertEquals(0, mTm.subtract(id).getNorm(), 1.0e-14);
<br>+ Assert.assertEquals(0, mTm.subtract(id).getNorm(), 1.0e-14);
<br> }
<br>
<br>+ @Test
<br> public void testBBiDiagonal() {
<br> checkBiDiagonal(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testSquare)).getB());
<br> checkBiDiagonal(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testNonSquare)).getB());
<br>@@ -108,17 +107,61 @@
<br> for (int j = 0; j < cols; ++j) {
<br> if (rows < cols) {
<br> if ((i < j) || (i > j + 1)) {
<br>- assertEquals(0, m.getEntry(i, j), 1.0e-16);
<br>+ Assert.assertEquals(0, m.getEntry(i, j), 1.0e-16);
<br> }
<br> } else {
<br> if ((i < j - 1) || (i > j)) {
<br>- assertEquals(0, m.getEntry(i, j), 1.0e-16);
<br>+ Assert.assertEquals(0, m.getEntry(i, j), 1.0e-16);
<br> }
<br> }
<br> }
<br> }
<br> }
<br>
<br>+ @Test
<br>+ public void testSingularMatrix() {
<br>+ BiDiagonalTransformer transformer =
<br>+ new BiDiagonalTransformer(MatrixUtils.createRealMatrix(new double[][] {
<br>+ { 1.0, 2.0, 3.0 },
<br>+ { 2.0, 3.0, 4.0 },
<br>+ { 3.0, 5.0, 7.0 }
<br>+ }));
<br>+ final double s3 = Math.sqrt(3.0);
<br>+ final double s14 = Math.sqrt(14.0);
<br>+ final double s42 = Math.sqrt(42.0);
<br>+ final double s1553 = Math.sqrt(1553.0);
<br>+ RealMatrix uRef = MatrixUtils.createRealMatrix(new double[][] {
<br>+ { -1.0 / s14, 5.0 / s42, 1.0 / s3 },
<br>+ { -2.0 / s14, -4.0 / s42, 1.0 / s3 },
<br>+ { -3.0 / s14, 1.0 / s42, -1.0 / s3 }
<br>+ });
<br>+ RealMatrix bRef = MatrixUtils.createRealMatrix(new double[][] {
<br>+ { -s14, s1553 / s14, 0.0 },
<br>+ { 0.0, -87 * s3 / (s14 * s1553), -s3 * s14 / s1553 },
<br>+ { 0.0, 0.0, 0.0 }
<br>+ });
<br>+ RealMatrix vRef = MatrixUtils.createRealMatrix(new double[][] {
<br>+ { 1.0, 0.0, 0.0 },
<br>+ { 0.0, -23 / s1553, 32 / s1553 },
<br>+ { 0.0, -32 / s1553, -23 / s1553 }
<br>+ });
<br>+
<br>+ // check values against known references
<br>+ RealMatrix u = transformer.getU();
<br>+ Assert.assertEquals(0, u.subtract(uRef).getNorm(), 1.0e-14);
<br>+ RealMatrix b = transformer.getB();
<br>+ Assert.assertEquals(0, b.subtract(bRef).getNorm(), 1.0e-14);
<br>+ RealMatrix v = transformer.getV();
<br>+ Assert.assertEquals(0, v.subtract(vRef).getNorm(), 1.0e-14);
<br>+
<br>+ // check the same cached instance is returned the second time
<br>+ Assert.assertTrue(u == transformer.getU());
<br>+ Assert.assertTrue(b == transformer.getB());
<br>+ Assert.assertTrue(v == transformer.getV());
<br>+
<br>+ }
<br>+
<br>+ @Test
<br> public void testMatricesValues() {
<br> BiDiagonalTransformer transformer =
<br> new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testSquare));
<br>@@ -138,27 +181,24 @@
<br>
<br> // check values against known references
<br> RealMatrix u = transformer.getU();
<br>- assertEquals(0, u.subtract(uRef).getNorm(), 1.0e-14);
<br>+ Assert.assertEquals(0, u.subtract(uRef).getNorm(), 1.0e-14);
<br> RealMatrix b = transformer.getB();
<br>- assertEquals(0, b.subtract(bRef).getNorm(), 1.0e-14);
<br>+ Assert.assertEquals(0, b.subtract(bRef).getNorm(), 1.0e-14);
<br> RealMatrix v = transformer.getV();
<br>- assertEquals(0, v.subtract(vRef).getNorm(), 1.0e-14);
<br>+ Assert.assertEquals(0, v.subtract(vRef).getNorm(), 1.0e-14);
<br>
<br> // check the same cached instance is returned the second time
<br>- assertTrue(u == transformer.getU());
<br>- assertTrue(b == transformer.getB());
<br>- assertTrue(v == transformer.getV());
<br>+ Assert.assertTrue(u == transformer.getU());
<br>+ Assert.assertTrue(b == transformer.getB());
<br>+ Assert.assertTrue(v == transformer.getV());
<br>
<br> }
<br>
<br>+ @Test
<br> public void testUpperOrLower() {
<br>- assertTrue(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testSquare)).isUpperBiDiagonal());
<br>- assertTrue(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testNonSquare)).isUpperBiDiagonal());
<br>- assertFalse(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testNonSquare).transpose()).isUpperBiDiagonal());
<br>- }
<br>-
<br>- public static Test suite() {
<br>- return new TestSuite(BiDiagonalTransformerTest.class);
<br>+ Assert.assertTrue(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testSquare)).isUpperBiDiagonal());
<br>+ Assert.assertTrue(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testNonSquare)).isUpperBiDiagonal());
<br>+ Assert.assertFalse(new BiDiagonalTransformer(MatrixUtils.createRealMatrix(testNonSquare).transpose()).isUpperBiDiagonal());
<br> }
<br>
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26548139
svn commit: r885027 - in /commons/proper/math/trunk/src: main/java/org/apache/commons/math/util/MathUtils.java site/xdoc/changes.xml test/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClustererTest.java
2009-11-27T13:45:39Z
2009-11-27T13:45:39Z
psteitz
Author: psteitz
<br>Date: Fri Nov 27 21:45:38 2009
<br>New Revision: 885027
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885027&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885027&view=rev</a><br>Log:
<br>Fixed an overflow error in MathUtils.distance that was causing KMeansPlusPlusClusterer to fail with a NullPointerException when
<br>component distances between points exceeded Integer.MAXVALUE.
<br>JIRA: MATH-305
<br>Reported by Erik van Ingen
<br><br>Modified:
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/MathUtils.java
<br> commons/proper/math/trunk/src/site/xdoc/changes.xml
<br> commons/proper/math/trunk/src/test/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClustererTest.java
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/MathUtils.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/MathUtils.java?rev=885027&r1=885026&r2=885027&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/MathUtils.java?rev=885027&r1=885026&r2=885027&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/MathUtils.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/MathUtils.java Fri Nov 27 21:45:38 2009
<br>@@ -1621,9 +1621,9 @@
<br> * @return the L<sub>2</sub> distance between the two points
<br> */
<br> public static double distance(int[] p1, int[] p2) {
<br>- int sum = 0;
<br>+ double sum = 0;
<br> for (int i = 0; i < p1.length; i++) {
<br>- final int dp = p1[i] - p2[i];
<br>+ final double dp = p1[i] - p2[i];
<br> sum += dp * dp;
<br> }
<br> return Math.sqrt(sum);
<br><br>Modified: commons/proper/math/trunk/src/site/xdoc/changes.xml
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/site/xdoc/changes.xml?rev=885027&r1=885026&r2=885027&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/site/xdoc/changes.xml?rev=885027&r1=885026&r2=885027&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/site/xdoc/changes.xml (original)
<br>+++ commons/proper/math/trunk/src/site/xdoc/changes.xml Fri Nov 27 21:45:38 2009
<br>@@ -39,6 +39,11 @@
<br> </properties>
<br> <body>
<br> <release version="2.1" date="TBD" description="TBD">
<br>+ <action dev="psteitz" type="fix" issue="MATH-305" due-to="Erik van Ingen">
<br>+ Fixed an overflow error in MathUtils.distance that was causing KMeansPlusPlusClusterer
<br>+ to fail with a NullPointerException when component distances between points
<br>+ exceeded Integer.MAXVALUE.
<br>+ </action>
<br> <action dev="psteitz" type="update" issue="MATH-315" due-to="Mikkel Meyer Andersen">
<br> Added generationsEvolved property to GeneticAlgorithm to track the number of generations
<br> evolved by the evolve() method before reaching the StoppingCondition.
<br><br>Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClustererTest.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClustererTest.java?rev=885027&r1=885026&r2=885027&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClustererTest.java?rev=885027&r1=885026&r2=885027&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClustererTest.java (original)
<br>+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClustererTest.java Fri Nov 27 21:45:38 2009
<br>@@ -93,5 +93,27 @@
<br> assertTrue(cluster3Found);
<br>
<br> }
<br>+
<br>+ /**
<br>+ * JIRA: MATH-305
<br>+ *
<br>+ * Two points, one cluster, one iteration
<br>+ */
<br>+ @Test
<br>+ public void testPerformClusterAnalysisDegenerate() {
<br>+ KMeansPlusPlusClusterer<EuclideanIntegerPoint> transformer = new KMeansPlusPlusClusterer<EuclideanIntegerPoint>(
<br>+ new Random(1746432956321l));
<br>+ EuclideanIntegerPoint[] points = new EuclideanIntegerPoint[] {
<br>+ new EuclideanIntegerPoint(new int[] { 1959, 325100 }),
<br>+ new EuclideanIntegerPoint(new int[] { 1960, 373200 }), };
<br>+ List<Cluster<EuclideanIntegerPoint>> clusters = transformer.cluster(Arrays.asList(points), 1, 1);
<br>+ assertEquals(1, clusters.size());
<br>+ assertEquals(2, (clusters.get(0).getPoints().size()));
<br>+ EuclideanIntegerPoint pt1 = new EuclideanIntegerPoint(new int[] { 1959, 325100 });
<br>+ EuclideanIntegerPoint pt2 = new EuclideanIntegerPoint(new int[] { 1960, 373200 });
<br>+ assertTrue(clusters.get(0).getPoints().contains(pt1));
<br>+ assertTrue(clusters.get(0).getPoints().contains(pt2));
<br>+
<br>+ }
<br>
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26547748
svn commit: r885013 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java
2009-11-27T13:05:04Z
2009-11-27T13:05:04Z
psteitz
Author: psteitz
<br>Date: Fri Nov 27 21:05:04 2009
<br>New Revision: 885013
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885013&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885013&view=rev</a><br>Log:
<br>Added toString.
<br><br>Modified:
<br> commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java
<br><br>Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java?rev=885013&r1=885012&r2=885013&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java?rev=885013&r1=885012&r2=885013&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java (original)
<br>+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java Fri Nov 27 21:05:04 2009
<br>@@ -98,5 +98,20 @@
<br> }
<br> return hashCode;
<br> }
<br>+
<br>+ /** {@inheritDoc} */
<br>+ @Override
<br>+ public String toString() {
<br>+ final StringBuffer buff = new StringBuffer("(");
<br>+ final int[] coordinates = getPoint();
<br>+ for (int i = 0; i < coordinates.length; i++) {
<br>+ buff.append(coordinates[i]);
<br>+ if (i < coordinates.length - 1) {
<br>+ buff.append(",");
<br>+ }
<br>+ }
<br>+ buff.append(")");
<br>+ return buff.toString();
<br>+ }
<br>
<br> }
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>
tag:old.nabble.com,2006:post-26547735
svn commit: r885009 - /commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestBinary.java
2009-11-27T13:03:35Z
2009-11-27T13:03:35Z
psteitz
Author: psteitz
<br>Date: Fri Nov 27 21:03:34 2009
<br>New Revision: 885009
<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=885009&view=rev" target="_top" rel="nofollow">http://svn.apache.org/viewvc?rev=885009&view=rev</a><br>Log:
<br>Fixed test case for number of generations evolved.
<br><br>Modified:
<br> commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestBinary.java
<br><br>Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestBinary.java
<br>URL: <a href="http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestBinary.java?rev=885009&r1=885008&r2=885009&view=diff" target="_top" rel="nofollow">http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestBinary.java?rev=885009&r1=885008&r2=885009&view=diff</a><br>==============================================================================
<br>--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestBinary.java (original)
<br>+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestBinary.java Fri Nov 27 21:03:34 2009
<br>@@ -48,6 +48,8 @@
<br> MUTATION_RATE,
<br> new TournamentSelection(TOURNAMENT_ARITY)
<br> );
<br>+
<br>+ assertEquals(0, ga.getGenerationsEvolved());
<br>
<br> // initial population
<br> Population initial = randomPopulation();
<br>@@ -67,9 +69,8 @@
<br> // however, for some implementations of GA, this need not be true :)
<br>
<br> assertTrue(bestFinal.compareTo(bestInitial) > 0);
<br>-
<br>- //System.out.println(bestInitial);
<br>- //System.out.println(bestFinal);
<br>+ assertEquals(NUM_GENERATIONS, ga.getGenerationsEvolved());
<br>+
<br> }
<br>
<br>
<br><br><br><p>From forum: <a href="http://old.nabble.com/Commons---Dev-f317.html" embed="fixTarget[317]" target="_top" >Commons - Dev</a></p>