svn commit: r793940 - /commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
Author: sgoeschl
Date: Tue Jul 14 15:25:10 2009
New Revision: 793940
URL: http://svn.apache.org/viewvc?rev=793940view=rev
Log:
[EXEC-40] Fixes NPE in DefaultExecutor.setExitValues().
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java?rev=793940r1=793939r2=793940view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
Tue Jul 14 15:25:10 2009
@@ -198,7 +198,7 @@
/** @see org.apache.commons.exec.Executor#setExitValues(int[]) */
public void setExitValues(final int[] values) {
-this.exitValues = (int[]) values.clone();
+this.exitValues = (values == null ? null : (int[]) values.clone());
}
/** @see org.apache.commons.exec.Executor#isFailure(int) */
svn commit: r793941 - in /commons/proper/exec/trunk: build.xml src/changes/changes.xml
Author: sgoeschl
Date: Tue Jul 14 15:25:50 2009
New Revision: 793941
URL: http://svn.apache.org/viewvc?rev=793941view=rev
Log:
Preparing RC for commons-exec-1.0.1
Modified:
commons/proper/exec/trunk/build.xml
commons/proper/exec/trunk/src/changes/changes.xml
Modified: commons/proper/exec/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/build.xml?rev=793941r1=793940r2=793941view=diff
==
--- commons/proper/exec/trunk/build.xml (original)
+++ commons/proper/exec/trunk/build.xml Tue Jul 14 15:25:50 2009
@@ -23,7 +23,7 @@
property file=user.properties /
property file=build.properties /
- property name=maven.build.version value=1.0.0/
+ property name=maven.build.version value=1.0.1/
property name=maven.build.output value=target/classes/
property name=maven.build.directory value=target/
property name=maven.build.final.name
value=commons-exec-${maven.build.version}/
Modified: commons/proper/exec/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/changes/changes.xml?rev=793941r1=793940r2=793941view=diff
==
--- commons/proper/exec/trunk/src/changes/changes.xml (original)
+++ commons/proper/exec/trunk/src/changes/changes.xml Tue Jul 14 15:25:50 2009
@@ -23,7 +23,10 @@
author email=sgoes...@apache.orgSiegfried Goeschl/author
/properties
body
-release version=1.0.1 date=2009-06-18 description=Maintenance
Release
+release version=1.0.1 date=2009-07-15 description=Maintenance
Release
+ action dev=sgoeschl type=fix due-to=Peter Henderson
issue=EXEC-40
+Fixes NPE in DefaultExecutor.setExitValues().
+ /action
action dev=sgoeschl type=fix due-to=Milos Kleint issue=EXEC-33
Copies all data from an System.input stream to an output stream of
the executed process.
svn commit: r793949 - /commons/proper/exec/trunk/src/site/xdoc/download_exec.xml
Author: sgoeschl Date: Tue Jul 14 15:47:36 2009 New Revision: 793949 URL: http://svn.apache.org/viewvc?rev=793949view=rev Log: Preparing new release Modified: commons/proper/exec/trunk/src/site/xdoc/download_exec.xml Modified: commons/proper/exec/trunk/src/site/xdoc/download_exec.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/site/xdoc/download_exec.xml?rev=793949r1=793948r2=793949view=diff == --- commons/proper/exec/trunk/src/site/xdoc/download_exec.xml (original) +++ commons/proper/exec/trunk/src/site/xdoc/download_exec.xml Tue Jul 14 15:47:36 2009 @@ -102,17 +102,17 @@ ul class=downloads li class=groupdiv class=linksspan class=labelBinary/span/div ul - li class=downloada href=[preferred]/commons/exec/binaries/commons-exec-1.0-bin.tar.gz1.0.tar.gz/a + li class=downloada href=[preferred]/commons/exec/binaries/commons-exec-1.0.1-bin.tar.gz1.0.1.tar.gz/a ul class=attributes - lispan class=md5[a href=http://www.apache.org/dist/commons/exec/binaries/commons-exec-1.0-bin.tar.gz.md5;md5/a]/span - span class=pgp[a href=http://www.apache.org/dist/commons/exec/binaries/commons-exec-1.0-bin.tar.gz.asc;pgp/a]/span + lispan class=md5[a href=http://www.apache.org/dist/commons/exec/binaries/commons-exec-1.0.1-bin.tar.gz.md5;md5/a]/span + span class=pgp[a href=http://www.apache.org/dist/commons/exec/binaries/commons-exec-1.0.1-bin.tar.gz.asc;pgp/a]/span /li /ul /li - li class=downloada href=[preferred]/commons/exec/binaries/commons-exec-1.0-bin.zip1.0.zip/a + li class=downloada href=[preferred]/commons/exec/binaries/commons-exec-1.0.1-bin.zip1.0.1.zip/a ul class=attributes - lispan class=md5[a href=http://www.apache.org/dist/commons/exec/binaries/commons-exec-1.0-bin.zip.md5;md5/a]/span - span class=pgp[a href=http://www.apache.org/dist/commons/exec/binaries/commons-exec-1.0-bin.zip.asc;pgp/a]/span + lispan class=md5[a href=http://www.apache.org/dist/commons/exec/binaries/commons-exec-1.0.1-bin.zip.md5;md5/a]/span + span class=pgp[a href=http://www.apache.org/dist/commons/exec/binaries/commons-exec-1.0.1-bin.zip.asc;pgp/a]/span /li /ul /li @@ -120,17 +120,17 @@ /li li class=groupdiv class=linksspan class=labelSource/span/div ul - li class=downloada href=[preferred]/commons/exec/source/commons-exec-1.0-src.tar.gz1.0.tar.gz/a + li class=downloada href=[preferred]/commons/exec/source/commons-exec-1.0.1-src.tar.gz1.0.1.tar.gz/a ul class=attributes - lispan class=md5[a href=http://www.apache.org/dist/commons/exec/source/commons-exec-1.0-src.tar.gz.md5;md5/a]/span - span class=pgp[a href=http://www.apache.org/dist/commons/exec/source/commons-exec-1.0-src.tar.gz.asc;pgp/a]/span + lispan class=md5[a href=http://www.apache.org/dist/commons/exec/source/commons-exec-1.0.1-src.tar.gz.md5;md5/a]/span + span class=pgp[a href=http://www.apache.org/dist/commons/exec/source/commons-exec-1.0.1-src.tar.gz.asc;pgp/a]/span /li /ul /li - li class=downloada href=[preferred]/commons/exec/source/commons-exec-1.0-src.zip1.0.zip/a + li class=downloada href=[preferred]/commons/exec/source/commons-exec-1.0.1-src.zip1.0.1.zip/a ul class=attributes - lispan class=md5[a href=http://www.apache.org/dist/commons/exec/source/commons-exec-1.0-src.zip.md5;md5/a]/span - span class=pgp[a href=http://www.apache.org/dist/commons/exec/source/commons-exec-1.0-src.zip.asc;pgp/a]/span + lispan class=md5[a href=http://www.apache.org/dist/commons/exec/source/commons-exec-1.0.1-src.zip.md5;md5/a]/span + span class=pgp[a href=http://www.apache.org/dist/commons/exec/source/commons-exec-1.0.1-src.zip.asc;pgp/a]/span /li /ul /li
svn commit: r793951 - in /commons/proper/exec/trunk/src/test/scripts: exec41.bat exec41.sh
Author: sgoeschl Date: Tue Jul 14 15:49:28 2009 New Revision: 793951 URL: http://svn.apache.org/viewvc?rev=793951view=rev Log: Updated the SVN properties for the new test scripts Modified: commons/proper/exec/trunk/src/test/scripts/exec41.bat (props changed) commons/proper/exec/trunk/src/test/scripts/exec41.sh (props changed) Propchange: commons/proper/exec/trunk/src/test/scripts/exec41.bat -- svn:eol-style = CRLF Propchange: commons/proper/exec/trunk/src/test/scripts/exec41.sh -- svn:eol-style = LF
svn commit: r793957 - /commons/proper/exec/trunk/pom.xml
Author: sgoeschl Date: Tue Jul 14 16:13:33 2009 New Revision: 793957 URL: http://svn.apache.org/viewvc?rev=793957view=rev Log: [maven-release-plugin] prepare release EXEC_1_0_1_RC1 Modified: commons/proper/exec/trunk/pom.xml Modified: commons/proper/exec/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/pom.xml?rev=793957r1=793956r2=793957view=diff == --- commons/proper/exec/trunk/pom.xml (original) +++ commons/proper/exec/trunk/pom.xml Tue Jul 14 16:13:33 2009 @@ -25,7 +25,7 @@ nameCommons Exec/name groupIdorg.apache.commons/groupId artifactIdcommons-exec/artifactId - version1.0.1-SNAPSHOT/version + version1.0.1/version descriptionA library to reliably execute external processes from within the JVM/description urlhttp://commons.apache.org/exec//url @@ -79,9 +79,9 @@ /contributors scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/exec/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/exec/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/commons/proper/exec/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/exec/tags/EXEC_1_0_1_RC1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/exec/tags/EXEC_1_0_1_RC1/developerConnection + urlhttp://svn.apache.org/viewvc/commons/proper/exec/tags/EXEC_1_0_1_RC1/url /scm build
svn commit: r793958 - in /commons/proper/exec/tags/EXEC_1_0_1_RC1: ./ pom.xml
Author: sgoeschl Date: Tue Jul 14 16:13:49 2009 New Revision: 793958 URL: http://svn.apache.org/viewvc?rev=793958view=rev Log: [maven-release-plugin] copy for tag EXEC_1_0_1_RC1 Added: commons/proper/exec/tags/EXEC_1_0_1_RC1/ - copied from r793956, commons/proper/exec/trunk/ commons/proper/exec/tags/EXEC_1_0_1_RC1/pom.xml - copied unchanged from r793957, commons/proper/exec/trunk/pom.xml
svn commit: r793959 - /commons/proper/exec/trunk/pom.xml
Author: sgoeschl Date: Tue Jul 14 16:16:03 2009 New Revision: 793959 URL: http://svn.apache.org/viewvc?rev=793959view=rev Log: [maven-release-plugin] rollback the release of EXEC_1_0_1_RC1 Modified: commons/proper/exec/trunk/pom.xml Modified: commons/proper/exec/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/pom.xml?rev=793959r1=793958r2=793959view=diff == --- commons/proper/exec/trunk/pom.xml (original) +++ commons/proper/exec/trunk/pom.xml Tue Jul 14 16:16:03 2009 @@ -25,7 +25,7 @@ nameCommons Exec/name groupIdorg.apache.commons/groupId artifactIdcommons-exec/artifactId - version1.0.1/version + version1.0.1-SNAPSHOT/version descriptionA library to reliably execute external processes from within the JVM/description urlhttp://commons.apache.org/exec//url @@ -79,9 +79,9 @@ /contributors scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/exec/tags/EXEC_1_0_1_RC1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/exec/tags/EXEC_1_0_1_RC1/developerConnection - urlhttp://svn.apache.org/viewvc/commons/proper/exec/tags/EXEC_1_0_1_RC1/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/exec/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/exec/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/commons/proper/exec/trunk/url /scm build
svn commit: r793962 - /commons/proper/exec/trunk/pom.xml
Author: sgoeschl Date: Tue Jul 14 16:20:24 2009 New Revision: 793962 URL: http://svn.apache.org/viewvc?rev=793962view=rev Log: Re-running the release to recover from SVN error Modified: commons/proper/exec/trunk/pom.xml Modified: commons/proper/exec/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/pom.xml?rev=793962r1=793961r2=793962view=diff == --- commons/proper/exec/trunk/pom.xml (original) +++ commons/proper/exec/trunk/pom.xml Tue Jul 14 16:20:24 2009 @@ -199,7 +199,7 @@ commons.jira.pid12310814/commons.jira.pid commons.release.version1.0.1/commons.release.version !-- The RC version used in the staging repository URL. -- -commons.rc.versionRC1/commons.rc.version +commons.rc.versionRC2/commons.rc.version !-- Tell M2 not to use platform specific encodings for copying resources -- project.build.sourceEncodingUTF-8/project.build.sourceEncoding project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
svn commit: r793963 - /commons/proper/exec/trunk/pom.xml
Author: sgoeschl Date: Tue Jul 14 16:25:48 2009 New Revision: 793963 URL: http://svn.apache.org/viewvc?rev=793963view=rev Log: [maven-release-plugin] prepare release EXEC_1_0_1_RC2 Modified: commons/proper/exec/trunk/pom.xml Modified: commons/proper/exec/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/pom.xml?rev=793963r1=793962r2=793963view=diff == --- commons/proper/exec/trunk/pom.xml (original) +++ commons/proper/exec/trunk/pom.xml Tue Jul 14 16:25:48 2009 @@ -25,7 +25,7 @@ nameCommons Exec/name groupIdorg.apache.commons/groupId artifactIdcommons-exec/artifactId - version1.0.1-SNAPSHOT/version + version1.0.1/version descriptionA library to reliably execute external processes from within the JVM/description urlhttp://commons.apache.org/exec//url @@ -79,9 +79,9 @@ /contributors scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/exec/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/exec/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/commons/proper/exec/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/exec/tags/EXEC_1_0_1_RC2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/exec/tags/EXEC_1_0_1_RC2/developerConnection + urlhttp://svn.apache.org/viewvc/commons/proper/exec/tags/EXEC_1_0_1_RC2/url /scm build
svn commit: r793964 - in /commons/proper/exec/tags/EXEC_1_0_1_RC2: ./ pom.xml
Author: sgoeschl Date: Tue Jul 14 16:26:04 2009 New Revision: 793964 URL: http://svn.apache.org/viewvc?rev=793964view=rev Log: [maven-release-plugin] copy for tag EXEC_1_0_1_RC2 Added: commons/proper/exec/tags/EXEC_1_0_1_RC2/ - copied from r793960, commons/proper/exec/trunk/ commons/proper/exec/tags/EXEC_1_0_1_RC2/pom.xml - copied unchanged from r793963, commons/proper/exec/trunk/pom.xml
svn commit: r794010 - /commons/proper/codec/trunk/xdocs/changes.xml
Author: ggregory Date: Tue Jul 14 18:45:52 2009 New Revision: 794010 URL: http://svn.apache.org/viewvc?rev=794010view=rev Log: [CODEC-40] Patch to add crypto-compatible BigInteger encoding support to Base64. Modified: commons/proper/codec/trunk/xdocs/changes.xml Modified: commons/proper/codec/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/xdocs/changes.xml?rev=794010r1=794009r2=794010view=diff == --- commons/proper/codec/trunk/xdocs/changes.xml (original) +++ commons/proper/codec/trunk/xdocs/changes.xml Tue Jul 14 18:45:52 2009 @@ -59,6 +59,9 @@ action dev=bayard type=fix issue=CODEC-51 2 Test failures in SoundexTest /action + action dev=bayard type=add issue=CODEC-40 due-to=Chris Black + Patch to add crypto-compatible BigInteger encoding support to Base64 + /action action dev=ggregory type=add issue=CODEC-39 due-to=Jamie Flournoy due-to-email=ja...@white-mountain.org DigestUtils: Add methods for SHA-256, SHA-384, and SHA-512./action action dev=tobrien type=fix issue=CODEC-10 due-to=Reggie Riser due-to-email=rri...@informs.com
svn commit: r794019 - /commons/proper/codec/trunk/src/conf/MANIFEST.MF
Author: ggregory Date: Tue Jul 14 19:10:54 2009 New Revision: 794019 URL: http://svn.apache.org/viewvc?rev=794019view=rev Log: Preparing for 1.4. Modified: commons/proper/codec/trunk/src/conf/MANIFEST.MF Modified: commons/proper/codec/trunk/src/conf/MANIFEST.MF URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/conf/MANIFEST.MF?rev=794019r1=794018r2=794019view=diff == --- commons/proper/codec/trunk/src/conf/MANIFEST.MF (original) +++ commons/proper/codec/trunk/src/conf/MANIFEST.MF Tue Jul 14 19:10:54 2009 @@ -1,7 +1,7 @@ Extension-Name: org.apache.commons.codec Specification-Title: Jakarta Commons Codec Specification-Vendor: Apache Software Foundation -Specification-Version: 1.3 +Specification-Version: 1.4 Implementation-Title: org.apache.commons.codec Implementation-Vendor: Apache Software Foundation -Implementation-Version: 1.3 \ No newline at end of file +Implementation-Version: 1.4 \ No newline at end of file
svn commit: r794022 - /commons/proper/codec/trunk/xdocs/changes.xml
Author: ggregory Date: Tue Jul 14 19:11:41 2009 New Revision: 794022 URL: http://svn.apache.org/viewvc?rev=794022view=rev Log: Preparing for 1.4. Modified: commons/proper/codec/trunk/xdocs/changes.xml Modified: commons/proper/codec/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/xdocs/changes.xml?rev=794022r1=794021r2=794022view=diff == --- commons/proper/codec/trunk/xdocs/changes.xml (original) +++ commons/proper/codec/trunk/xdocs/changes.xml Tue Jul 14 19:11:41 2009 @@ -24,13 +24,16 @@ body release version=1-4-SNAPSHOT date=13 July 2009 description=Feature and fix release. action dev=ggregory type=add issue=CODEC-77 due-to=Julius Davies - Base64 bug with empty input (new byte[0])/action + Base64 bug with empty input (new byte[0]). + /action action dev=ggregory type=add issue=CODEC-75 due-to=Julius Davies - Make Base64 URL-safe/action + Make Base64 URL-safe. + /action action dev=ggregory type=add issue=CODEC-74 - Allow for uppercase letters output in Hex.encodeHex()/action + Allow for uppercase letters output in Hex.encodeHex(). + /action action dev=bayard type=fix issue=CODEC-72 due-to=Sebb - Soundex and RefinedSoundex issues with character arrays + Soundex and RefinedSoundex issues with character arrays. /action action dev=bayard type=fix issue=CODEC-71 due-to=Sebb Base64.isArrayByteBase64() method is inefficient for large byte arrays. @@ -39,10 +42,10 @@ Thread safety and malicious code safety improvements. /action action dev=bayard type=fix issue=CODEC-68 due-to=Robert Rodewald - isBase64 throws ArrayIndexOutOfBoundsException on some non-BASE64 bytes + isBase64 throws ArrayIndexOutOfBoundsException on some non-BASE64 bytes. /action action dev=bayard type=fix issue=CODEC-65 due-to=Benjamin Bentmann - Fix case-insensitive string handling + Fix case-insensitive string handling. /action action dev=ggregory type=fix issue=CODEC-61 due-to=Igor Slepchin Base64.encodeBase64() throws NegativeArraySizeException on large files. @@ -51,22 +54,22 @@ Implement Caverphone. /action action dev=bayard type=fix issue=CODEC-56 due-to=Sebb - RefinedSoundex creates instance before al fields have been initialized + RefinedSoundex creates instance before al fields have been initialized. /action action dev=bayard type=add issue=CODEC-52 due-to=Niklas Gustavsson - Digest on InputStreams + Digest on InputStreams. /action action dev=bayard type=fix issue=CODEC-51 - 2 Test failures in SoundexTest + 2 Test failures in SoundexTest. /action action dev=bayard type=add issue=CODEC-40 due-to=Chris Black - Patch to add crypto-compatible BigInteger encoding support to Base64 + Patch to add crypto-compatible BigInteger encoding support to Base64. /action action dev=ggregory type=add issue=CODEC-39 due-to=Jamie Flournoy due-to-email=ja...@white-mountain.org -DigestUtils: Add methods for SHA-256, SHA-384, and SHA-512./action +DigestUtils: Add methods for SHA-256, SHA-384, and SHA-512. +/action action dev=tobrien type=fix issue=CODEC-10 due-to=Reggie Riser due-to-email=rri...@informs.com -Using US_ENGLISH in Soundex caused an NullPointerException. Issue has been -addressed by changing the order of static variables in Soundex. +Using US_ENGLISH in Soundex caused an NullPointerException. /action action dev=tobrien type=fix issue=CODEC-6 due-to=David Tonhofer Source tarball spews files all over the place.
svn commit: r794025 - /commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/RefinedSoundex.java
Author: ggregory Date: Tue Jul 14 19:20:24 2009 New Revision: 794025 URL: http://svn.apache.org/viewvc?rev=794025view=rev Log: Clirr detected change from public to private. Revert in preparation for 1.4. Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/RefinedSoundex.java Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/RefinedSoundex.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/RefinedSoundex.java?rev=794025r1=794024r2=794025view=diff == --- commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/RefinedSoundex.java (original) +++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/RefinedSoundex.java Tue Jul 14 19:20:24 2009 @@ -40,7 +40,7 @@ * mappings have been altered. This implementation contains default * mappings for US English. */ -private static final char[] US_ENGLISH_MAPPING = US_ENGLISH_MAPPING_STRING.toCharArray(); +public static final char[] US_ENGLISH_MAPPING = US_ENGLISH_MAPPING_STRING.toCharArray(); /** * Every letter of the alphabet is mapped to a numerical value. This char
svn commit: r794133 [2/2] - in /commons/proper/jexl/branches/2.0/src: java/org/apache/commons/jexl/ java/org/apache/commons/jexl/parser/ java/org/apache/commons/jexl/util/introspection/ test/org/apach
Added:
commons/proper/jexl/branches/2.0/src/test/org/apache/commons/jexl/UnifiedJEXLTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/test/org/apache/commons/jexl/UnifiedJEXLTest.java?rev=794133view=auto
==
---
commons/proper/jexl/branches/2.0/src/test/org/apache/commons/jexl/UnifiedJEXLTest.java
(added)
+++
commons/proper/jexl/branches/2.0/src/test/org/apache/commons/jexl/UnifiedJEXLTest.java
Wed Jul 15 03:43:49 2009
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.jexl;
+
+import junit.framework.TestCase;
+/**
+ * Test cases for the UnifiedEL.
+ */
+public class UnifiedJEXLTest extends TestCase {
+static JexlEngine JEXL = new JexlEngine();
+static {
+JEXL.setSilent(false);
+}
+static UnifiedJEXL EL = new UnifiedJEXL(JEXL);
+
+public static class Froboz {
+int value;
+public Froboz(int v) {
+value = v;
+}
+public void setValue(int v) {
+value = v;
+}
+public int getValue() {
+return value;
+}
+}
+
+public static class Quux {
+String str;
+Froboz froboz;
+public Quux(String str, int fro) {
+this.str = str;
+froboz = new Froboz(fro);
+}
+
+public Froboz getFroboz() {
+return froboz;
+}
+
+public void setFroboz(Froboz froboz) {
+this.froboz = froboz;
+}
+
+public String getStr() {
+return str;
+}
+
+public void setStr(String str) {
+this.str = str;
+}
+}
+
+public UnifiedJEXLTest(String testName) {
+super(testName);
+}
+
+
+public void testAssign() throws Exception {
+UnifiedJEXL.Expression assign = EL.parse(${froboz.value = 10});
+UnifiedJEXL.Expression check = EL.parse(${froboz.value});
+JexlContext jc = JexlHelper.createContext();
+Object o = assign.evaluate(jc);
+assertEquals(Result is not 10, new Integer(10), o);
+o = check.evaluate(jc);
+assertEquals(Result is not 10, new Integer(10), o);
+}
+
+public void testDear() throws Exception {
+UnifiedJEXL.Expression assign = EL.parse(Dear ${p} ${name};);
+JexlContext jc = JexlHelper.createContext();
+jc.getVars().put(p, Mr);
+jc.getVars().put(name, Doe);
+Object o = assign.evaluate(jc);
+assertEquals(Dear Mr Doe;, o);
+jc.getVars().put(p, Ms);
+jc.getVars().put(name, Jones);
+o = assign.evaluate(jc);
+assertEquals(Dear Ms Jones;, o);
+}
+
+public void testDear2Phase() throws Exception {
+UnifiedJEXL.Expression assign = EL.parse(Dear #{p} ${name};);
+JexlContext jc = JexlHelper.createContext();
+jc.getVars().put(name, Doe);
+UnifiedJEXL.Expression phase1 = assign.prepare(jc);
+jc.getVars().put(p, Mr);
+jc.getVars().put(name, Should not be used in 2nd phase);
+Object o = phase1.evaluate(jc);
+assertEquals(Dear Mr Doe;, o);
+}
+
+public void testNested() throws Exception {
+UnifiedJEXL.Expression expr = EL.parse(#{${hi}+'.world'});
+JexlContext jc = JexlHelper.createContext();
+jc.getVars().put(hi, hello);
+jc.getVars().put(hello.world, Hello World!);
+Object o = expr.evaluate(jc);
+assertEquals(Hello World!, o);
+}
+
+public void testImmediate() throws Exception {
+UnifiedJEXL.Expression expr = EL.parse(${'Hello ' + 'World!'});
+JexlContext jc = JexlHelper.createContext();
+Object o = expr.evaluate(jc);
+assertEquals(Hello World!, o);
+}
+
+public void testDeferred() throws Exception {
+UnifiedJEXL.Expression expr = EL.parse(#{'world'});
+JexlContext jc = JexlHelper.createContext();
+Object o = expr.evaluate(jc);
+assertEquals(world, o);
+}
+
+public void testCharAtBug() throws Exception {
+JexlContext jc =
svn commit: r794134 - /commons/proper/jexl/branches/2.0/
Author: rahul Date: Wed Jul 15 03:56:51 2009 New Revision: 794134 URL: http://svn.apache.org/viewvc?rev=794134view=rev Log: More fodder for svn:ignore. Modified: commons/proper/jexl/branches/2.0/ (props changed) Propchange: commons/proper/jexl/branches/2.0/ -- --- svn:ignore (original) +++ svn:ignore Wed Jul 15 03:56:51 2009 @@ -1,6 +1,9 @@ build.properties dist target +.project +.classpath +.settings *.log *.gz tmp
svn commit: r794136 - /commons/proper/jexl/branches/2.0/src/java/org/apache/commons/jexl/JexlArithmetic.java
Author: rahul Date: Wed Jul 15 04:07:17 2009 New Revision: 794136 URL: http://svn.apache.org/viewvc?rev=794136view=rev Log: Make coercion exception messages consistent. Modified: commons/proper/jexl/branches/2.0/src/java/org/apache/commons/jexl/JexlArithmetic.java Modified: commons/proper/jexl/branches/2.0/src/java/org/apache/commons/jexl/JexlArithmetic.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/java/org/apache/commons/jexl/JexlArithmetic.java?rev=794136r1=794135r2=794136view=diff == --- commons/proper/jexl/branches/2.0/src/java/org/apache/commons/jexl/JexlArithmetic.java (original) +++ commons/proper/jexl/branches/2.0/src/java/org/apache/commons/jexl/JexlArithmetic.java Wed Jul 15 04:07:17 2009 @@ -463,7 +463,7 @@ return ((Number) val).intValue(); } -throw new IllegalArgumentException(Integer coercion exception, don't know how to convert + val); +throw new IllegalArgumentException(Integer coercion exception. Can't coerce type: + val.getClass().getName()); } @@ -489,7 +489,7 @@ return ((Number) val).longValue(); } -throw new NumberFormatException(Long coercion exception for ' + val + '); +throw new NumberFormatException(Long coercion exception. Can't coerce type: + val.getClass().getName()); } /** @@ -516,7 +516,7 @@ return BigInteger.valueOf(i); } -throw new IllegalArgumentException(BigInteger coercion. Can't coerce type + val.getClass().getName()); +throw new IllegalArgumentException(BigInteger coercion exception. Can't coerce type: + val.getClass().getName()); } /** @@ -543,7 +543,7 @@ return new BigDecimal(i); } -throw new IllegalArgumentException(BigDecimal coercion. Can't coerce type + val.getClass().getName()); +throw new IllegalArgumentException(BigDecimal coercion exception. Can't coerce type: + val.getClass().getName()); } /** @@ -576,7 +576,7 @@ throw new IllegalArgumentException(Boolean-Double coercion exception); } -throw new IllegalArgumentException(Double coercion exception, don't know how to convert + val); +throw new IllegalArgumentException(Double coercion exception. Can't coerce type: + val.getClass().getName()); } /** * Is Object a floating point number.
svn commit: r794137 - /commons/proper/jexl/branches/2.0/pom.xml
Author: rahul Date: Wed Jul 15 04:10:33 2009 New Revision: 794137 URL: http://svn.apache.org/viewvc?rev=794137view=rev Log: Next anticipated release from this branch is v2.0. Modified: commons/proper/jexl/branches/2.0/pom.xml Modified: commons/proper/jexl/branches/2.0/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/pom.xml?rev=794137r1=794136r2=794137view=diff == --- commons/proper/jexl/branches/2.0/pom.xml (original) +++ commons/proper/jexl/branches/2.0/pom.xml Wed Jul 15 04:10:33 2009 @@ -109,7 +109,7 @@ maven.compile.source1.5/maven.compile.source maven.compile.target1.5/maven.compile.target commons.componentidjexl/commons.componentid -commons.release.version1.1/commons.release.version +commons.release.version2.0/commons.release.version commons.binary.suffix/commons.binary.suffix commons.jira.idJEXL/commons.jira.id commons.jira.pid12310479/commons.jira.pid
