Nabble - Commons - Dev

svn commit: r834346 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java

2009-11-09T21:05:54Z

Author: psteitz
Date: Tue Nov 10 05:05:54 2009
New Revision: 834346

URL: http://svn.apache.org/viewvc?rev=834346&view=rev
Log:
Made inner class static.

Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java?rev=834346&r1=834345&r2=834346&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java Tue Nov 10 05:05:54 2009
@@ -719,7 +719,7 @@
/** The name of the "value" attribute. */
protected static final String ATT_VALUE = "value";

- class ConstructorDetails {
+ static class ConstructorDetails {
private ConstructorDetails _parent = null;
private Class _type = null;
private ArrayList _argTypes = null;

Re: [VOTE] Release BeanUtils 1.8.2 based on RC1

2009-11-09T21:05:00Z

+1

Phil

Niall Pemberton wrote:

> One of the bugs (BEANUTILS-345) fixed in BeanUtils 1.8.1 has resulted
> in a new bug (BEANUTILS-368) so I'd like to release BeanUtils 1.8.2 to
> fix this problem.
>
> [ ] +1 Yes go ahead an release based on RC1
> [ ] -1 No, because...
>
> BeanUtils 1.8.2 RC1 is available for review here:
> http://people.apache.org/~niallp/beanutils-1.8.2-rc1/
>
> Maven artifacts are here:
> http://people.apache.org/~niallp/beanutils-1.8.2-rc1/maven/commons-beanutils/
>
> Details of changes since 1.8.1 are in the release notes:
> http://people.apache.org/~niallp/beanutils-1.8.2-rc1/RELEASE-NOTES.txt
> http://people.apache.org/~niallp/beanutils-1.8.2-rc1/site/changes-report.html
>
> I have tested this with JDK 1.3 & 1.4 using ant and JDK 1.5 & 1.6 using maven2.
>
> The tag is here:
> http://svn.apache.org/viewvc/commons/proper/beanutils/tags/BEANUTILS_1_8_2_RC1/
>
> Site:
> http://people.apache.org/~niallp/beanutils-1.8.2-rc1/site/
> (note some *relative* links are broken and the 1.8.2 directories are
> not yet created - these will be OK once the site is deployed)
>
> Clirr Report (compared to 1.8.0):
> http://people.apache.org/~niallp/beanutils-1.8.2-rc1/site/clirr-report.html
>
> RAT Report:
> http://people.apache.org/~niallp/beanutils-1.8.2-rc1/site/rat-report.html
>
> tia
>
> Niall
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834335 - /commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java

2009-11-09T20:19:12Z

Author: psteitz
Date: Tue Nov 10 04:19:12 2009
New Revision: 834335

URL: http://svn.apache.org/viewvc?rev=834335&view=rev
Log:
Added test case verifying that prepared statement pool acts as LRU cache.

Modified:
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java?rev=834335&r1=834334&r2=834335&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java Tue Nov 10 04:19:12 2009
@@ -87,6 +87,61 @@
PreparedStatement stmt4 = conn.prepareStatement("select 'a' from dual");
assertNotNull(stmt4);
}
+
+ /**
+ * Verifies that the prepared statement pool behaves as an LRU cache,
+ * closing least-recently-used statements idle in the pool to make room
+ * for new ones if necessary.
+ */
+ public void testLRUBehavior() throws Exception {
+ ds.setMaxOpenPreparedStatements(3);
+
+ Connection conn = getConnection();
+ assertNotNull(conn);
+
+ // Open 3 statements and then close them into the pool
+ PreparedStatement stmt1 = conn.prepareStatement("select 'a' from dual");
+ PreparedStatement inner1 = (PreparedStatement) ((DelegatingPreparedStatement) stmt1).getInnermostDelegate();
+ PreparedStatement stmt2 = conn.prepareStatement("select 'b' from dual");
+ PreparedStatement inner2 = (PreparedStatement) ((DelegatingPreparedStatement) stmt2).getInnermostDelegate();
+ PreparedStatement stmt3 = conn.prepareStatement("select 'c' from dual");
+ PreparedStatement inner3 = (PreparedStatement) ((DelegatingPreparedStatement) stmt3).getInnermostDelegate();
+ stmt1.close();
+ Thread.sleep(100); // Make sure return timestamps are different
+ stmt2.close();
+ Thread.sleep(100);
+ stmt3.close();
+
+ // Pool now has three idle statements, getting another one will force oldest (stmt1) out
+ PreparedStatement stmt4 = conn.prepareStatement("select 'd' from dual");
+ assertNotNull(stmt4);
+
+ // Verify that inner1 has been closed
+ try {
+ inner1.clearParameters();
+ fail("expecting SQLExcption - statement should be closed");
+ } catch (SQLException ex) {
+ //Expected
+ }
+ // But others are still open
+ inner2.clearParameters();
+ inner3.clearParameters();
+
+ // Now make sure stmt1 does not come back from the dead
+ PreparedStatement stmt5 = conn.prepareStatement("select 'a' from dual");
+ PreparedStatement inner5 = (PreparedStatement) ((DelegatingPreparedStatement) stmt5).getInnermostDelegate();
+ assertNotSame(inner5, inner1);
+
+ // inner2 should be closed now
+ try {
+ inner2.clearParameters();
+ fail("expecting SQLExcption - statement should be closed");
+ } catch (SQLException ex) {
+ //Expected
+ }
+ // But inner3 should still be open
+ inner3.clearParameters();
+ }

// Bugzilla Bug 27246
// PreparedStatement cache should be different depending on the Catalog

Re: [VOTE] Release BeanUtils 1.8.2 based on RC1

2009-11-09T19:37:32Z

On Mon, Nov 9, 2009 at 2:06 PM, Niall Pemberton
<niall.pemberton@...> wrote:
> One of the bugs (BEANUTILS-345) fixed in BeanUtils 1.8.1 has resulted
> in a new bug (BEANUTILS-368) so I'd like to release BeanUtils 1.8.2 to
> fix this problem.
>
> [X] +1 Yes go ahead an release based on RC1
> [ ] -1 No, because...
>
<snip/>

-Rahul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [dbcp] Callable statement pooling (DBCP-204)

2009-11-09T19:25:23Z

Mark Thomas wrote:

> Phil Steitz wrote:
>> OK, I am now feeling stupid.
> You and me both.
>
>> GKOP already has LRU-cache like
>> behavior. (See clearOldest test in allocate()). Given compat
>> issues, I am inclined to move forward with 0).
>
> +1
>
> We'll also need pool 1.5.4 as well to fix an edge case where the pool
> could lock up.
>
> Mark
>

One question. The patch introduces a statement type flag as part of
the key to distinguish prepared statements from callable statements.
I am not sure this is necessary. Can anyone imagine a scenario
where the same exact sql is used in prepareStatement and
prepareCall? Are there drivers that even allow this ("call" in
prepareStatement sql, or no "call" in prepareCall) If not, we do not
need the additional flag.

Phil
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [dbcp] Callable statement pooling (DBCP-204)

2009-11-09T19:12:24Z

Mark Thomas wrote:

Will get RCs for both this weekend. Sorry for delay.

Phil

>
> Mark
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [VOTE] Release BeanUtils 1.8.1 based on RC1

2009-11-09T18:50:57Z

On Mon, Nov 9, 2009 at 2:32 PM, Niall Pemberton
<niall.pemberton@...> wrote:

> On Wed, Oct 14, 2009 at 3:24 AM, Rahul Akolkar <rahul.akolkar@...> wrote:
>> On Thu, Oct 8, 2009 at 10:31 AM, Niall Pemberton
>> <niall.pemberton@...> wrote:
>>> We have fixed a number of bugs since BeanUtils 1.8.0 was released a
>>> year ago and I'd like to release BeanUtils 1.8.1
>>>
>>> [X] +1 Yes go ahead an release based on RC1
>>> [ ] -1 No, because...
>>>
>> <snip/>
>>
>> Nits include release notes formatting (line width) and perhaps using
>> different product names in the NOTICE files for the "other" jars.
>
> Rahul,
>
> I did look at this comment before the 1.8.2 release - wrt to the
> NOTICE file I'd rather not maintain 3 copies of it for each of the
> jars.
>

<snip/>

OK, your call :-)

-Rahul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834257 - in /commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl: ClassCreator.java ClassCreatorTest.java

2009-11-09T14:16:28Z

Author: henrib
Date: Mon Nov 9 22:16:28 2009
New Revision: 834257

URL: http://svn.apache.org/viewvc?rev=834257&view=rev
Log:
Fix for JEXL-61; all caches get wrapped by SoftReference, allowing them to be GCed under memory pressure.

Added:
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreator.java (with props)
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreatorTest.java (with props)

Added: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreator.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreator.java?rev=834257&view=auto
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreator.java (added)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreator.java Mon Nov 9 22:16:28 2009
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2009 henri.
+ *
+ * Licensed 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.
+ * under the License.
+ */
+package org.apache.commons.jexl;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+/**
+ * Helper class to test GC / reference interactions.
+ * Dynamically creates a class by compiling generated source Java code and
+ * load it through a dedicated class loader.
+ */
+public class ClassCreator {
+ private final File base;
+ private File packageDir = null;
+ private int seed = 0;
+ private String className = null;
+ private String sourceName = null;
+ private ClassLoader loader = null;
+
+ public ClassCreator(File theBase) throws Exception {
+ base = theBase;
+ }
+
+ public void clear() {
+ seed = 0;
+ packageDir = null;
+ className = null;
+ sourceName = null;
+ packageDir = null;
+ loader = null;
+ }
+
+ public void setSeed(int s) {
+ seed = s;
+ className = "foo" + s;
+ sourceName = className + ".java";
+ packageDir = new File(base, seed + "/org/apache/commons/jexl/generated");
+ packageDir.mkdirs();
+ loader = null;
+ }
+
+ public String getClassName() {
+ return "org.apache.commons.jexl.generated." + className;
+ }
+
+ public Class<?> getClassInstance() throws Exception {
+ return getClassLoader().loadClass("org.apache.commons.jexl.generated." + className);
+ }
+
+ public ClassLoader getClassLoader() throws Exception {
+ if (loader == null) {
+ URL classpath = (new File(base, Integer.toString(seed))).toURI().toURL();
+ loader = new URLClassLoader(new URL[]{classpath}, null);
+ }
+ return loader;
+ }
+
+ public Class<?> createClass() throws Exception {
+ // generate, compile & validate
+ generate();
+ Class<?> clazz = compile();
+ if (clazz == null) {
+ throw new Exception("failed to compile foo" + seed);
+ }
+ Object v = validate(clazz);
+ if (v instanceof Integer && ((Integer) v).intValue() == seed) {
+ return clazz;
+ }
+ throw new Exception("failed to validate foo" + seed);
+ }
+
+ void generate() throws Exception {
+ FileWriter aWriter = new FileWriter(new File(packageDir, sourceName), false);
+ aWriter.write("package org.apache.commons.jexl.generated;");
+ aWriter.write("public class " + className + "{\n");
+ aWriter.write("private int value =");
+ aWriter.write(Integer.toString(seed));
+ aWriter.write(";\n");
+ aWriter.write(" public void setValue(int v) {");
+ aWriter.write(" value = v;");
+ aWriter.write(" }\n");
+ aWriter.write(" public int getValue() {");
+ aWriter.write(" return value;");
+ aWriter.write(" }\n");
+ aWriter.write(" }\n");
+ aWriter.flush();
+ aWriter.close();
+ }
+
+ Class<?> compile() throws Exception {
+ String[] source = {packageDir.getPath() + "/" + sourceName};
+ if (com.sun.tools.javac.Main.compile(source) >= 0) {
+ return getClassLoader().loadClass("org.apache.commons.jexl.generated." + className);
+ }
+ return null;
+ }
+
+ Object validate(Class<?> clazz) throws Exception {
+ Class<?> params[] = {};
+ Object paramsObj[] = {};
+ Object iClass = clazz.newInstance();
+ Method thisMethod = clazz.getDeclaredMethod("getValue", params);
+ return thisMethod.invoke(iClass, paramsObj);
+ }
+}

Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreator.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreatorTest.java?rev=834257&view=auto
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreatorTest.java (added)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreatorTest.java Mon Nov 9 22:16:28 2009
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2009 henri.
+ *
+ * Licensed 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.
+ * under the License.
+ */
+package org.apache.commons.jexl;
+
+import java.io.File;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Basic check on automated class creation
+ */
+public class ClassCreatorTest extends JexlTestCase {
+ static final Log logger = LogFactory.getLog(JexlTestCase.class);
+ static final int LOOPS = 8;
+ private File base = null;
+
+ @Override
+ public void setUp() throws Exception {
+ base = new File(System.getProperty("java.io.tmpdir")
+ + File.pathSeparator
+ + "jexl"
+ + System.currentTimeMillis());
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ deleteDirectory(base);
+ }
+
+ private void deleteDirectory(File dir) {
+ if (dir.isDirectory()) {
+ for (File file : dir.listFiles()) {
+ if (file.isFile()) {
+ file.delete();
+ }
+ }
+ }
+ dir.delete();
+ }
+
+ // A space hog class
+ static final int MEGA = 1024 * 1024;
+ public class BigObject {
+ private final byte[] space = new byte[MEGA];
+ private final int id;
+
+ public BigObject(int id) {
+ this.id = id;
+ }
+
+ public int getId() {
+ return id;
+ }
+ }
+
+ // A soft reference on class
+ static final class ClassReference extends WeakReference<Class<?>> {
+ ClassReference(Class<?> clazz, ReferenceQueue<Object> queue) {
+ super(clazz, queue);
+ }
+ }
+ // A weak reference on instance
+ static final class InstanceReference extends SoftReference<Object> {
+ InstanceReference(Object obj, ReferenceQueue<Object> queue) {
+ super(obj, queue);
+ }
+ }
+
+ public void testOne() throws Exception {
+ ClassCreator cctor = new ClassCreator(base);
+ cctor.setSeed(1);
+ Class<?> foo1 = cctor.createClass();
+ assertEquals("foo1", foo1.getSimpleName());
+ cctor.clear();
+ }
+
+ public void testMany() throws Exception {
+ int pass = 0;
+ int gced = -1;
+ ReferenceQueue<Object> queue = new ReferenceQueue<Object>();
+ List<Reference<?>> stuff = new ArrayList<Reference<?>>();
+ // keeping a reference on methods prevent classes from being GCed
+// List<Object> mm = new ArrayList<Object>();
+ JexlEngine jexl = new JexlEngine();
+ jexl.setCache(512);
+ Expression expr = jexl.createExpression("foo.value");
+ Expression newx = jexl.createExpression("foo = new(clazz)");
+ JexlContext context = JexlHelper.createContext();
+
+ ClassCreator cctor = new ClassCreator(base);
+ for (int i = 0; i < LOOPS && gced < 0; ++i) {
+ cctor.setSeed(i);
+ Class<?> clazz;
+ if (pass ==0) {
+ clazz = cctor.createClass();
+ } else {
+ clazz = cctor.getClassInstance();
+ if (clazz == null) {
+ assertEquals(i, gced);
+ break;
+ }
+ }
+ // this code verifies the assumption that holding a strong reference to a method prevents
+ // its owning class from being GCed
+// Method m = clazz.getDeclaredMethod("getValue", new Class<?>[0]);
+// mm.add(m);
+ // we should not be able to create foox since it is unknown to the Jexl classloader
+ context.getVars().put("clazz", cctor.getClassName());
+ context.getVars().put("foo", null);
+ Object z = newx.evaluate(context);
+ assertNull(z);
+ // check with the class itself
+ context.getVars().put("clazz", clazz);
+ z = newx.evaluate(context);
+ assertNotNull(clazz + ": class " + i + " could not be instantiated on pass " + pass, z);
+ assertEquals(new Integer(i), expr.evaluate(context));
+ // with the proper class loader, attempt to create an instance from the class name
+ jexl.setClassLoader(cctor.getClassLoader());
+ z = newx.evaluate(context);
+ assertTrue(z.getClass().equals(clazz));
+ assertEquals(new Integer(i), expr.evaluate(context));
+ cctor.clear();
+ jexl.setClassLoader(null);
+
+ // on pass 0, attempt to force GC to run and collect generated classes
+ if (pass == 0) {
+ // add a weak reference on the class
+ stuff.add(new ClassReference(clazz, queue));
+ // add a soft reference on an instance
+ stuff.add(new InstanceReference(clazz.newInstance(), queue));
+
+ // attempt to force GC:
+ // while we still have a MB free, create & store big objects
+ for (int b = 0; b < 64 && Runtime.getRuntime().freeMemory() > MEGA; ++b) {
+ BigObject big = new BigObject(b);
+ stuff.add(new InstanceReference(big, queue));
+ }
+ // hint it...
+ System.gc();
+ // let's see if some weak refs got collected
+ boolean qr = false;
+ while (queue.poll() != null) {
+ Reference<?> ref = queue.remove(1);
+ if (ref instanceof ClassReference) {
+ gced = i;
+ qr = true;
+ }
+ }
+ if (qr) {
+ //logger.warn("may have GCed class around " + i);
+ pass = 1;
+ i = 0;
+ }
+ }
+ }
+
+ if (gced < 0) {
+ logger.warn("unable to force GC");
+ //assertTrue(gced > 0);
+ }
+ }
+
+ static public void main(String[] args) throws Exception {
+ (new ClassCreatorTest()).runTest("testMany");
+ }
+}

Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ClassCreatorTest.java
------------------------------------------------------------------------------
svn:eol-style = native

svn commit: r834256 - in /commons/proper/jexl/trunk: ./ src/main/java/org/apache/commons/jexl/ src/main/java/org/apache/commons/jexl/util/ src/main/java/org/apache/commons/jexl/util/introspection/

2009-11-09T14:15:44Z

Author: henrib
Date: Mon Nov 9 22:15:43 2009
New Revision: 834256

URL: http://svn.apache.org/viewvc?rev=834256&view=rev
Log:
Fix for JEXL-61; all caches get wrapped by SoftReference, allowing them to be GCed under memory pressure.

Modified:
commons/proper/jexl/trunk/pom.xml
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/Interpreter.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlEngine.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/UnifiedJEXL.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/Introspector.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/Introspector.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/IntrospectorBase.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/MethodKey.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/MethodMap.java
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/UberspectImpl.java

Modified: commons/proper/jexl/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=834256&r1=834255&r2=834256&view=diff
==============================================================================
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Mon Nov 9 22:15:43 2009
@@ -19,240 +19,240 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-parent</artifactId>
- <version>12</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <name>Commons JEXL</name>
- <inceptionYear>2003</inceptionYear>
- <description>Jexl is an implementation of the JSTL Expression Language with extensions.</description>
- <url>http://commons.apache.org/jexl/</url>
-
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/JEXL</url>
- </issueManagement>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jexl/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jexl/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/jexl/trunk</url>
- </scm>
-
- <developers>
- <developer>
- <name>dIon Gillard</name>
- <id>dion</id>
- <email>dion@...</email>
- <organization>Apache Software Foundation</organization>
- </developer>
- <developer>
- <name>Geir Magnusson Jr.</name>
- <id>geirm</id>
- <email>geirm@...</email>
- <organization>independent</organization>
- </developer>
- <developer>
- <name>Tim O'Brien</name>
- <id>tobrien</id>
- <email>tobrien@...</email>
- <organization>independent</organization>
- </developer>
- <developer>
- <name>Peter Royal</name>
- <id>proyal</id>
- <email>proyal@...</email>
- <organization>Apache Software Foundation</organization>
- </developer>
- <developer>
- <name>James Strachan</name>
- <id>jstrachan</id>
- <email>jstrachan@...</email>
- <organization>SpiritSoft, Inc.</organization>
- </developer>
- <developer>
- <name>Rahul Akolkar</name>
- <id>rahul</id>
- <email>rahul AT apache.org</email>
- <organization>Apache Software Foundation</organization>
- </developer>
- <developer>
- <name>Henri Biestro</name>
- <id>henrib</id>
- <email>henrib AT apache.org</email>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <optional>true</optional>
- </dependency>
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>12</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <name>Commons JEXL</name>
+ <inceptionYear>2003</inceptionYear>
+ <description>Jexl is an implementation of the JSTL Expression Language with extensions.</description>
+ <url>http://commons.apache.org/jexl/</url>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/JEXL</url>
+ </issueManagement>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jexl/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jexl/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/jexl/trunk</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <name>dIon Gillard</name>
+ <id>dion</id>
+ <email>dion@...</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <name>Geir Magnusson Jr.</name>
+ <id>geirm</id>
+ <email>geirm@...</email>
+ <organization>independent</organization>
+ </developer>
+ <developer>
+ <name>Tim O'Brien</name>
+ <id>tobrien</id>
+ <email>tobrien AT apache DOT org</email>
+ <organization>independent</organization>
+ </developer>
+ <developer>
+ <name>Peter Royal</name>
+ <id>proyal</id>
+ <email>proyal AT apache DOT org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <name>James Strachan</name>
+ <id>jstrachan</id>
+ <email>jstrachan AT apache DOT org</email>
+ <organization>SpiritSoft, Inc.</organization>
+ </developer>
+ <developer>
+ <name>Rahul Akolkar</name>
+ <id>rahul</id>
+ <email>rahul AT apache DOT org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <name>Henri Biestro</name>
+ <id>henrib</id>
+ <email>henrib AT apache DOT org</email>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <optional>true</optional>
+ </dependency>

- <dependency>
- <groupId>org.apache.bsf</groupId>
- <artifactId>bsf-api</artifactId>
- <version>3.0-beta3</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
- <commons.componentid>jexl</commons.componentid>
- <commons.release.version>2.0</commons.release.version>
- <commons.binary.suffix></commons.binary.suffix>
- <commons.jira.id>JEXL</commons.jira.id>
- <commons.jira.pid>12310479</commons.jira.pid>
+ <dependency>
+ <groupId>org.apache.bsf</groupId>
+ <artifactId>bsf-api</artifactId>
+ <version>3.0-beta3</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <maven.compile.source>1.5</maven.compile.source>
+ <maven.compile.target>1.5</maven.compile.target>
+ <commons.componentid>jexl</commons.componentid>
+ <commons.release.version>2.0</commons.release.version>
+ <commons.binary.suffix></commons.binary.suffix>
+ <commons.jira.id>JEXL</commons.jira.id>
+ <commons.jira.pid>12310479</commons.jira.pid>

- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>

- <build>
+ <build>

- <resources>
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>

- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>jexl-jjtree</id>
- <configuration>
- <sourceDirectory>${basedir}/src/main/java/org/apache/commons/jexl/parser</sourceDirectory>
- <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
- <timestampDirectory>${project.build.directory}/generated-sources/javacc-timestamp</timestampDirectory>
- <packageName>org.apache.commons.jexl.parser</packageName>
- </configuration>
- <goals>
- <goal>jjtree-javacc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>jexl-jjtree</id>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/java/org/apache/commons/jexl/parser</sourceDirectory>
+ <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
+ <timestampDirectory>${project.build.directory}/generated-sources/javacc-timestamp</timestampDirectory>
+ <packageName>org.apache.commons.jexl.parser</packageName>
+ </configuration>
+ <goals>
+ <goal>jjtree-javacc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>

<reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
- <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
- <excludes>org/apache/commons/jexl/parser/*.java</excludes>
- <headerFile>${basedir}/src/main/config/header.txt</headerFile>
- <enableRulesSummary>false</enableRulesSummary>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <instrumentation>
- <excludes>
- <exclude>org/apache/commons/jexl/parser/*.class</exclude>
- <exclude>apache/commons/jexl/**/*Test.class</exclude>
- </excludes>
- </instrumentation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
+ <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
+ <excludes>org/apache/commons/jexl/parser/*.java</excludes>
+ <headerFile>${basedir}/src/main/config/header.txt</headerFile>
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <instrumentation>
+ <excludes>
+ <exclude>org/apache/commons/jexl/parser/*.class</exclude>
+ <exclude>apache/commons/jexl/**/*Test.class</exclude>
+ </excludes>
+ </instrumentation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>

- <xmlOutputDirectory>target/site</xmlOutputDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <targetJdk>1.5</targetJdk>
- <excludes>
- <exclude>org/apache/commons/jexl/parser/*.java</exclude>
- </excludes>
- <rulesets>
- <ruleset>/rulesets/braces.xml</ruleset>
- <ruleset>/rulesets/unusedcode.xml</ruleset>
- <ruleset>/rulesets/imports.xml</ruleset>
- <ruleset>/rulesets/codesize.xml</ruleset>
- <ruleset>/rulesets/coupling.xml</ruleset>
- <ruleset>/rulesets/design.xml</ruleset>
- <ruleset>/rulesets/strings.xml</ruleset>
- </rulesets>
- </configuration>
- </plugin>
- </plugins>
+ <xmlOutputDirectory>target/site</xmlOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <excludes>
+ <exclude>org/apache/commons/jexl/parser/*.java</exclude>
+ </excludes>
+ <rulesets>
+ <ruleset>/rulesets/braces.xml</ruleset>
+ <ruleset>/rulesets/unusedcode.xml</ruleset>
+ <ruleset>/rulesets/imports.xml</ruleset>
+ <ruleset>/rulesets/codesize.xml</ruleset>
+ <ruleset>/rulesets/coupling.xml</ruleset>
+ <ruleset>/rulesets/design.xml</ruleset>
+ <ruleset>/rulesets/strings.xml</ruleset>
+ </rulesets>
+ </configuration>
+ </plugin>
+ </plugins>
</reporting>

</project>
\ No newline at end of file

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/Interpreter.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/Interpreter.java?rev=834256&r1=834255&r2=834256&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/Interpreter.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/Interpreter.java Mon Nov 9 22:15:43 2009
@@ -319,7 +319,7 @@
Object entry = node.jjtGetChild(i).jjtAccept(this, data);
array[i] = entry;
}
- return array;
+ return arithmetic.narrowArrayType(array);
}

/** {@inheritDoc} */
@@ -630,7 +630,7 @@
if (value == null
&& !(node.jjtGetParent() instanceof ASTReference)
&& !context.getVars().containsKey(name)) {
- JexlException xjexl = new JexlException(node, "undefined variable " + node.image);
+ JexlException xjexl = new JexlException(node, "undefined variable " + name);
return unknownVariable(xjexl);
}
return value;

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlEngine.java?rev=834256&r1=834255&r2=834256&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlEngine.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlEngine.java Mon Nov 9 22:15:43 2009
@@ -23,10 +23,13 @@
import java.io.InputStreamReader;
import java.io.StringReader;
import java.io.Reader;
+import java.lang.ref.SoftReference;
import java.util.Map;
import java.util.Collections;
import java.net.URL;
import java.net.URLConnection;
+import java.util.Map.Entry;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

@@ -117,7 +120,7 @@
/**
* The expression cache.
*/
- protected Map<String, ASTJexlScript> cache = null;
+ protected SoftCache<String, ASTJexlScript> cache = null;
/**
* An empty/static/non-mutable JexlContext used instead of null context.
*/
@@ -229,6 +232,16 @@
}

/**
+ * Sets the class loader used to discover classes in 'new' expressions.
+ * This method should be called as an optional step of the JexlEngine
+ * initialization code before expression creation & evaluation.
+ * @param loader the class loader to use
+ */
+ public void setClassLoader(ClassLoader loader) {
+ uberspect.getIntrospector().setLoader(loader);
+ }
+
+ /**
* Sets a cache of the defined size for expressions.
* @param size if not strictly positive, no cache is used.
*/
@@ -238,7 +251,7 @@
if (size <= 0) {
cache = null;
} else if (cache == null || cache.size() != size) {
- cache = createCache(size);
+ cache = new SoftCache<String,ASTJexlScript>(size);
}
}
}
@@ -543,17 +556,86 @@
return new Interpreter(this, context);
}

+ /**
+ * A soft reference on cache.
+ * The cache is held through a soft reference, allowing it to be GCed under
+ * memory pressure.
+ * @param <K> the cache key entry type
+ * @param <V> the cache key value type
+ */
+ protected class SoftCache<K,V> {
+ /**
+ * The cache size.
+ */
+ private final int size;
+ /**
+ * The soft reference to the cache map.
+ */
+ private SoftReference<Map<K, V>> ref = null;
+ /**
+ * Creates a new instance of a soft cache.
+ * @param theSize the cache size
+ */
+ SoftCache(int theSize) {
+ size = theSize;
+ }
+
+ /**
+ * Returns the cache size.
+ * @return the cache size
+ */
+ int size() {
+ return size;
+ }
+
+ /**
+ * Produces the cache entry set.
+ * @return the cache entry set
+ */
+ @SuppressWarnings("unchecked")
+ Set<Entry<K,V>> entrySet() {
+ Map<K, V> map = ref != null? ref.get() : null;
+ return map != null? map.entrySet() : (Set<Entry<K,V>>) Collections.EMPTY_SET;
+ }
+
+ /**
+ * Gets a value from cache.
+ * @param key the cache entry key
+ * @return the cache entry value
+ */
+ V get(K key) {
+ final Map<K, V> map = ref != null? ref.get() : null;
+ return map != null? map.get(key) : null;
+ }
+
+ /**
+ * Puts a value in cache.
+ * @param key the cache entry key
+ * @param script the cache entry value
+ */
+ void put(K key, V script) {
+ Map<K, V> map = ref != null? ref.get() : null;
+ if (map == null) {
+ map = createCache(size);
+ ref = new SoftReference<Map<K, V>>(map);
+ }
+ map.put(key, script);
+ }
+ }
+
/**
- * Creates a SimpleNode cache.
+ * Creates a cache.
+ * @param <K> the key type
+ * @param <V> the value type
* @param cacheSize the cache size, must be > 0
* @return a Map usable as a cache bounded to the given size
*/
- protected Map<String, ASTJexlScript> createCache(final int cacheSize) {
- return new java.util.LinkedHashMap<String, ASTJexlScript>(cacheSize, LOAD_FACTOR, true) {
+ protected <K,V> Map<K, V> createCache(final int cacheSize) {
+ return new java.util.LinkedHashMap<K, V>(cacheSize, LOAD_FACTOR, true) {
/** Serial version UID. */
private static final long serialVersionUID = 3801124242820219131L;
@Override
- protected boolean removeEldestEntry(Map.Entry<String, ASTJexlScript> eldest) {
+ protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
return size() > cacheSize;
}
};

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/UnifiedJEXL.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/UnifiedJEXL.java?rev=834256&r1=834255&r2=834256&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/UnifiedJEXL.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/UnifiedJEXL.java Mon Nov 9 22:15:43 2009
@@ -16,8 +16,6 @@
*/
package org.apache.commons.jexl;

-import java.util.Map;
-import java.util.LinkedHashMap;
import java.util.ArrayList;
import org.apache.commons.jexl.parser.JexlNode;
import org.apache.commons.jexl.parser.ParseException;
@@ -80,11 +78,9 @@
/** The JEXL engine instance. */
private final JexlEngine jexl;
/** The expression cache. */
- private final Map<String, Expression> cache;
+ private final JexlEngine.SoftCache<String,Expression> cache;
/** The default cache size. */
private static final int CACHE_SIZE = 512;
- /** The default cache load-factor. */
- private static final float LOAD_FACTOR = 0.75f;
/**
* Creates a new instance of UnifiedJEXL with a default size cache.
* @param aJexl the JexlEngine to use.
@@ -100,23 +96,7 @@
*/
public UnifiedJEXL(JexlEngine aJexl, int cacheSize) {
this.jexl = aJexl;
- this.cache = cacheSize > 0 ? createCache(cacheSize) : null;
- }
-
- /**
- * Creates an expression cache.
- * @param cacheSize the cache size, must be > 0
- * @return a LinkedHashMap
- */
- private static Map<String, Expression> createCache(final int cacheSize) {
- return new LinkedHashMap<String, Expression>(cacheSize, LOAD_FACTOR, true) {
- /** Serial version UID. */
- private static final long serialVersionUID = -6515503595421899722L;
- @Override
- protected boolean removeEldestEntry(Map.Entry<String, Expression> eldest) {
- return size() > cacheSize;
- }
- };
+ this.cache = aJexl.new SoftCache<String,Expression>(cacheSize);
}

/**
@@ -732,13 +712,15 @@
try {
if (cache == null) {
return parseExpression(expression);
- } else synchronized (cache) {
- Expression stmt = cache.get(expression);
- if (stmt == null) {
- stmt = parseExpression(expression);
- cache.put(expression, stmt);
+ } else {
+ synchronized (cache) {
+ Expression stmt = cache.get(expression);
+ if (stmt == null) {
+ stmt = parseExpression(expression);
+ cache.put(expression, stmt);
+ }
+ return stmt;
}
- return stmt;
}
} catch (JexlException xjexl) {
Exception xuel = new Exception("failed to parse '" + expression + "'", xjexl);

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/Introspector.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/Introspector.java?rev=834256&r1=834255&r2=834256&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/Introspector.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/Introspector.java Mon Nov 9 22:15:43 2009
@@ -16,6 +16,7 @@
*/
package org.apache.commons.jexl.util;

+import java.lang.ref.SoftReference;
import java.lang.reflect.Method;
import java.lang.reflect.Constructor;

@@ -31,13 +32,70 @@
* Finding methods as well as property getters & setters.
* @since 1.0
*/
-public class Introspector {
+public class Introspector {
/** The default uberspector that handles all introspection patterns. */
private static volatile Uberspect uberSpect;
/** The logger to use for all warnings & errors. */
protected final Log rlog;
/** The (low level) introspector to use for introspection services. */
- protected final org.apache.commons.jexl.util.introspection.Introspector introspector;
+ protected final Reference introspector;
+
+ /**
+ * A soft reference to an Introspector.
+ * 
+ * If memory pressure becomes critical, this will allow the introspector to be GCed;
+ * in turn, classes it introspected that are no longer in use may be GCed as well.
+ * 
+ */
+ protected final class Reference {
+ /**
+ * The introspector logger.
+ */
+ private final Log logger;
+ /**
+ * The soft reference to the introspector currently in use.
+ */
+ private volatile SoftReference<org.apache.commons.jexl.util.introspection.Introspector> ref;
+ /**
+ * Creates a new instance.
+ * @param theLogger logger used by the underlying introspector instance
+ * @param is the underlying introspector instance
+ */
+ protected Reference(Log theLogger, org.apache.commons.jexl.util.introspection.Introspector is) {
+ logger = theLogger;
+ ref = new SoftReference<org.apache.commons.jexl.util.introspection.Introspector>(is);
+ }
+
+ /**
+ * Creates a new instance.
+ * @param theLogger logger used by the underlying introspector instance
+ */
+ protected Reference(Log theLogger) {
+ this(theLogger, new org.apache.commons.jexl.util.introspection.Introspector(theLogger));
+ }
+
+ /**
+ * Gets the current introspector.
+ * If the reference has been collected, this method will recreate the underlying introspector.
+ * @return the introspector
+ */
+ // CSOFF: DoubleCheckedLocking
+ public org.apache.commons.jexl.util.introspection.Introspector get() {
+ org.apache.commons.jexl.util.introspection.Introspector intro = ref.get();
+ if (intro == null) {
+ // double checked locking (fixed by Java 5 memory model).
+ synchronized(this) {
+ intro = ref.get();
+ if (intro == null) {
+ intro = new org.apache.commons.jexl.util.introspection.Introspector(logger);
+ ref = new SoftReference<org.apache.commons.jexl.util.introspection.Introspector>(intro);
+ }
+ }
+ }
+ return intro;
+ }
+ // CSON: DoubleCheckedLocking
+ }

/**
* Gets the default instance of Uberspect.
@@ -49,7 +107,7 @@
*/
// CSOFF: DoubleCheckedLocking
public static Uberspect getUberspect() {
- // uses a double-locking pattern since java5 memory model allows it
+ // uses a double-locking pattern
if (uberSpect == null) {
synchronized (Uberspect.class) {
if (uberSpect == null) {
@@ -78,7 +136,7 @@
*/
public Introspector(Log log, org.apache.commons.jexl.util.introspection.Introspector is) {
rlog = log;
- introspector = is;
+ introspector = new Reference(log, is);
}

/**
@@ -95,7 +153,7 @@
}
try {
return Integer.valueOf(arg.toString());
- } catch(NumberFormatException xnumber) {
+ } catch (NumberFormatException xnumber) {
return null;
}
}
@@ -106,7 +164,7 @@
* @return a String if it can be converted, null otherwise
*/
protected String toString(Object arg) {
- return arg == null? null : arg.toString();
+ return arg == null ? null : arg.toString();
}

/**
@@ -123,7 +181,7 @@
* CSOFF: RedundantThrows
*/
protected final Method getMethod(Class<?> c, String name, Object[] params) throws IllegalArgumentException {
- return introspector.getMethod(c, new MethodKey(name, params));
+ return introspector.get().getMethod(c, new MethodKey(name, params));
}

/**
@@ -137,7 +195,7 @@
* CSOFF: RedundantThrows
*/
protected final Method getMethod(Class<?> c, MethodKey key) throws IllegalArgumentException {
- return introspector.getMethod(c, key);
+ return introspector.get().getMethod(c, key);
}

/**
@@ -148,14 +206,16 @@
*/
public final Constructor<?> getConstructor(Object ctorHandle, Object[] args) {
String className = null;
+ Class<?> clazz = null;
if (ctorHandle instanceof Class<?>) {
- className = ((Class<?>) ctorHandle).getName();
+ clazz = (Class<?>) ctorHandle;
+ className = clazz.getName();
} else if (ctorHandle != null) {
className = ctorHandle.toString();
} else {
return null;
}
- return introspector.getConstructor(new MethodKey(className, args));
+ return introspector.get().getConstructor(clazz, new MethodKey(className, args));
}

/**
@@ -167,7 +227,7 @@
*/
public final AbstractExecutor.Method getMethodExecutor(Object obj, String name, Object[] args) {
AbstractExecutor.Method me = new MethodExecutor(this, obj, name, args);
- return me.isAlive()? me : null;
+ return me.isAlive() ? me : null;
}

/**
@@ -248,12 +308,11 @@
return executor;
}
}
- // if that didn't work, look for get("foo")
+ // if that didn't work, look for set("foo")
executor = new DuckSetExecutor(this, claz, property, arg);
if (executor.isAlive()) {
return executor;
}
return null;
- }
-
+ }
}

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/Introspector.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/Introspector.java?rev=834256&r1=834255&r2=834256&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/Introspector.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/Introspector.java Mon Nov 9 22:15:43 2009
@@ -56,13 +56,6 @@
*/
public final class Introspector extends IntrospectorBase {
/**
- * define a public string so that it can be looked for
- * if interested.
- */
- public static final String CACHEDUMP_MSG =
- "Introspector : detected classloader change. Dumping cache.";
-
- /**
* Creates a new instance.
* @param logger a {@link Log}.
*/
@@ -78,8 +71,8 @@
*
* @return The desired Method object.
* @throws IllegalArgumentException When the parameters passed in can not be used for introspection.
- * CSOFF: RedundantThrows
*/
+ // CSOFF: RedundantThrows
@Override
public Method getMethod(Class<?> c, MethodKey key) throws IllegalArgumentException {
// just delegate to the base class
@@ -95,22 +88,25 @@
}
return null;
}
-
// CSON: RedundantThrows
+
/**
- * Gets the method defined by <code>key</code> for the Class <code>c</code>.
+ * Gets the constructor defined by <code>key</code> for the Class <code>c</code>.
*
+ * @param c the class to instantiate an object of if known, null otherwise
* @param key MethodKey of the method being searched for
*
* @return The desired Method object.
* @throws IllegalArgumentException When the parameters passed in can not be used for introspection.
- * CSOFF: RedundantThrows
+ *
+ *
*/
+ // CSOFF: RedundantThrows
@Override
- public Constructor<?> getConstructor(MethodKey key) throws IllegalArgumentException {
+ public Constructor<?> getConstructor(Class<?> c, MethodKey key) throws IllegalArgumentException {
// just delegate to the base class
try {
- return super.getConstructor(key);
+ return super.getConstructor(c, key);
} catch (MethodKey.AmbiguousException ae) {
// whoops. Ambiguous. Make a nice log message and return null...
if (rlog != null) {
@@ -119,15 +115,6 @@
}
}
return null;
- } // CSON: RedundantThrows
-
- /**
- * Clears the classmap and classname
- * caches, and logs that we did so.
- */
- @Override
- protected void clearCache() {
- super.clearCache();
- rlog.info(CACHEDUMP_MSG);
}
+ // CSON: RedundantThrows
}

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/IntrospectorBase.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/IntrospectorBase.java?rev=834256&r1=834255&r2=834256&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/IntrospectorBase.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/IntrospectorBase.java Mon Nov 9 22:15:43 2009
@@ -19,12 +19,8 @@

import java.lang.reflect.Method;
import java.lang.reflect.Constructor;
-import java.lang.ref.SoftReference;
-import java.util.HashSet;
import java.util.Map;
import java.util.HashMap;
-import java.util.WeakHashMap;
-import java.util.Set;
import java.util.List;
import java.util.LinkedList;

@@ -61,17 +57,14 @@
public class IntrospectorBase {
/** the logger. */
protected final Log rlog;
-
/**
* Holds the method maps for the classes we know about, keyed by Class.
- * Implemented as WeakHashMap so we wont prevent an unused class from being GCed.
*/
- private final Map<Class<?>, ClassMap> classMethodMaps = new WeakHashMap<Class<?>, ClassMap>();
+ private final Map<Class<?>, ClassMap> classMethodMaps = new HashMap<Class<?>, ClassMap>();
/**
- * Holds the qualified class names for the classes we hold in the
- * classMethodMaps hash.
+ * The class loader used to solve constructors if needed.
*/
- private Set<String> cachedClassNames = new HashSet<String>();
+ private ClassLoader loader;
/**
* Holds the map of classes ctors we know about as well as unknown ones.
*/
@@ -79,7 +72,7 @@
/**
* Holds the set of classes we have introspected.
*/
- private Map<String, SoftReference<Class<?>>> constructibleClasses = new HashMap<String, SoftReference<Class<?>>>();
+ private final Map<String, Class<?>> constructibleClasses = new HashMap<String, Class<?>>();

/**
* Create the introspector.
@@ -87,6 +80,7 @@
*/
public IntrospectorBase(Log log) {
this.rlog = log;
+ loader = getClass().getClassLoader();
}

/**
@@ -98,13 +92,15 @@
* @throws IllegalArgumentException When the parameters passed in can not be used for introspection.
* @throws MethodKey.AmbiguousException When the method map contains more than
* one match for the requested signature.
- * CSOFF: RedundantThrows
+ *
*/
+ //CSOFF: RedundantThrows
public Method getMethod(Class<?> c, MethodKey key) {
ClassMap classMap = getMap(c);
return classMap.findMethod(key);

- } // CSON: RedundantThrows
+ }
+ // CSON: RedundantThrows

/**
* Gets the accessible methods names known for a given class.
@@ -131,6 +127,24 @@
private static final Constructor<?> CTOR_MISS = CacheMiss.class.getConstructors()[0];

/**
+ * Sets the class loader used to solve constructors.
+ * Also cleans the constructors cache.
+ * @param cloader the class loader; if null, use this instance class loader
+ */
+ public void setLoader(ClassLoader cloader) {
+ if (cloader == null) {
+ cloader = getClass().getClassLoader();
+ }
+ if (!cloader.equals(loader)) {
+ synchronized(constructorsMap) {
+ loader = cloader;
+ constructorsMap.clear();
+ constructibleClasses.clear();
+ }
+ }
+ }
+
+ /**
* Gets the constructor defined by the <code>MethodKey</code>.
*
* @param key Key of the constructor being searched for
@@ -138,9 +152,22 @@
* @throws IllegalArgumentException When the parameters passed in can not be used for introspection.
* @throws MethodKey.AmbiguousException When the method map contains more than
* one match for the requested signature.
- * CSOFF: RedundantThrows
*/
public Constructor<?> getConstructor(final MethodKey key) {
+ return getConstructor(null, key);
+ }
+
+ /**
+ * Gets the constructor defined by the <code>MethodKey</code>.
+ * @param c the class we want to instantiate
+ * @param key Key of the constructor being searched for
+ * @return The desired Constructor object.
+ * @throws IllegalArgumentException When the parameters passed in can not be used for introspection.
+ * @throws MethodKey.AmbiguousException When the method map contains more than
+ * one match for the requested signature.
+ */
+ //CSOFF: RedundantThrows
+ public Constructor<?> getConstructor(final Class<?> c, final MethodKey key) {
Constructor<?> ctor = null;
synchronized(constructorsMap) {
ctor = constructorsMap.get(key);
@@ -152,22 +179,17 @@
if (ctor == null) {
final String cname = key.getMethod();
// do we know about this class?
- Class<?> clazz = null;
- SoftReference<Class<?>> sc = constructibleClasses.get(cname);
- if (sc != null) {
- clazz = sc.get();
- if (clazz == null) {
- // we knew about this class & it's gone, clear cache
- constructorsMap.clear();
- constructibleClasses = new HashMap<String, SoftReference<Class<?>>>();
- }
- }
+ Class<?> clazz = constructibleClasses.get(cname);
try {
// do find the most specific ctor
if (clazz == null) {
- clazz = Class.forName(cname);
- // add it to list of know loaded classes
- constructibleClasses.put(cname, new SoftReference<Class<?>>(clazz));
+ if (c != null && c.getName().equals(key.getMethod())) {
+ clazz = c;
+ } else {
+ clazz = loader.loadClass(cname);
+ }
+ // add it to list of known loaded classes
+ constructibleClasses.put(cname, clazz);
}
List<Constructor<?>> l = new LinkedList<Constructor<?>>();
for(Constructor<?> ictor : clazz.getConstructors()) {
@@ -193,6 +215,7 @@
}
return ctor;
}
+ // CSON: RedundantThrows

/**
* Gets the ClassMap for a given class.
@@ -202,50 +225,11 @@
private ClassMap getMap(Class<?> c) {
synchronized (classMethodMaps) {
ClassMap classMap = classMethodMaps.get(c);
- /*
- * if we don't have this, check to see if we have it by name. if so,
- * then we have a classloader change so dump our caches.
- */
-
if (classMap == null) {
- if (cachedClassNames.contains(c.getName())) {
- /*
- * we have a map for a class with same name, but not this
- * class we are looking at. This implies a classloader
- * change, so dump
- */
- clearCache();
- }
-
- classMap = createClassMap(c);
+ classMap = new ClassMap(c,rlog);
+ classMethodMaps.put(c, classMap);
}
return classMap;
}
}
-
- /**
- * Creates a class map for specific class and registers it in the cache.
- * Also adds the qualified name to the name->class map for later Classloader
- * change detection.
- * @param c class.
- * @return a {@link ClassMap}
- */
- private ClassMap createClassMap(Class<?> c) {
- ClassMap classMap = new ClassMap(c,rlog);
- classMethodMaps.put(c, classMap);
- cachedClassNames.add(c.getName());
-
- return classMap;
- }
-
- /**
- * Clears the classmap and classname caches.
- */
- protected void clearCache() {
- // since we are synchronizing on this object, we have to clear it rather
- // than just dump it.
- classMethodMaps.clear();
- // for speed, we can just make a new one and let the old one be GC'd
- cachedClassNames = new HashSet<String>();
- }
}
\ No newline at end of file

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/MethodKey.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/MethodKey.java?rev=834256&r1=834255&r2=834256&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/MethodKey.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/MethodKey.java Mon Nov 9 22:15:43 2009
@@ -145,9 +145,9 @@

/** {@inheritDoc} */
@Override
- public boolean equals(Object arg) {
- if (arg instanceof MethodKey) {
- MethodKey key = (MethodKey) arg;
+ public boolean equals(Object obj) {
+ if (obj instanceof MethodKey) {
+ MethodKey key = (MethodKey) obj;
return method.equals(key.method) && Arrays.equals(params, key.params);
}
return false;

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/MethodMap.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/MethodMap.java?rev=834256&r1=834255&r2=834256&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/MethodMap.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/MethodMap.java Mon Nov 9 22:15:43 2009
@@ -36,9 +36,7 @@
/**
* Keep track of all methods with the same name.
*/
- // CSOFF: VisibilityModifier
- private Map<String, List<Method>> methodByNameMap = new HashMap<String, List<Method>>();
- // CSON: VisibilityModifier
+ private final Map<String, List<Method>> methodByNameMap = new HashMap<String, List<Method>>();

/**
* Add a method to a list of methods by name. For a particular class we are

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/UberspectImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/UberspectImpl.java?rev=834256&r1=834255&r2=834256&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/UberspectImpl.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/util/introspection/UberspectImpl.java Mon Nov 9 22:15:43 2009
@@ -42,7 +42,7 @@
public class UberspectImpl extends org.apache.commons.jexl.util.Introspector implements Uberspect {
/** {@inheritDoc} */
public Introspector getIntrospector() {
- return introspector;
+ return introspector.get();
}

/**
@@ -66,7 +66,7 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public Iterator<?> getIterator(Object obj, DebugInfo i) {
+ public Iterator<?> getIterator(Object obj, DebugInfo info) {
if (obj.getClass().isArray()) {
return new ArrayIterator(obj);
} else if (obj instanceof Collection<?>) {
@@ -74,13 +74,13 @@
} else if (obj instanceof Map<?,?>) {
return ((Map<?,?>) obj).values().iterator();
} else if (obj instanceof Iterator<?>) {
- rlog.warn(i.debugString()
+ rlog.warn(info.debugString()
+ "The iterative is not resetable; if used more than once, "
+ "this may lead to unexpected results.");

return ((Iterator<?>) obj);
} else if (obj instanceof Enumeration<?>) {
- rlog.warn(i.debugString()
+ rlog.warn(info.debugString()
+ "The iterative is not resetable; if used more than once, "
+ "this may lead to unexpected results.");
return new EnumerationIterator<Object>((Enumeration<Object>) obj);
@@ -95,7 +95,7 @@
if (Iterator.class.isAssignableFrom(returns)) {
return (Iterator<?>) iter.invoke(obj, (Object[])null);
} else {
- rlog.error(i.debugString()
+ rlog.error(info.debugString()
+ "iterator() method does not return a true Iterator.");
}
// CSOFF: EmptyBlock
@@ -111,7 +111,7 @@
}

/* we have no clue what this is */
- rlog.warn(i.toString()
+ rlog.warn(info.toString()
+ "Could not determine type of iterator");

return null;
@@ -120,28 +120,28 @@
/**
* {@inheritDoc}
*/
- public Constructor<?> getConstructor(Object ctorHandle, Object[] args, DebugInfo i) {
+ public Constructor<?> getConstructor(Object ctorHandle, Object[] args, DebugInfo info) {
return getConstructor(ctorHandle, args);
}

/**
* {@inheritDoc}
*/
- public JexlMethod getMethod(Object obj, String methodName, Object[] args, DebugInfo i) {
- return getMethodExecutor(obj, methodName, args);
+ public JexlMethod getMethod(Object obj, String method, Object[] args, DebugInfo info) {
+ return getMethodExecutor(obj, method, args);
}

/**
* {@inheritDoc}
*/
- public JexlPropertyGet getPropertyGet(Object obj, Object identifier, DebugInfo i) {
+ public JexlPropertyGet getPropertyGet(Object obj, Object identifier, DebugInfo info) {
return getGetExecutor(obj, identifier);
}

/**
* {@inheritDoc}
*/
- public JexlPropertySet getPropertySet(final Object obj, final Object identifier, Object arg, DebugInfo i) {
+ public JexlPropertySet getPropertySet(final Object obj, final Object identifier, Object arg, DebugInfo info) {
return getSetExecutor(obj, identifier, arg);
}
}
\ No newline at end of file

svn commit: r834255 - in /commons/proper/jexl/trunk/src: main/java/org/apache/commons/jexl/JexlArithmetic.java test/java/org/apache/commons/jexl/ArrayLiteralTest.java

2009-11-09T14:10:43Z

Author: henrib
Date: Mon Nov 9 22:10:42 2009
New Revision: 834255

URL: http://svn.apache.org/viewvc?rev=834255&view=rev
Log:
Made array literals strongly typed; the code will attempt to find a common class for all elements of an array literal. Thus a ['foo', 'bar'] will create a String[ ] . If all elements are primitives of the same type, the returned array will be of that primitive type; [1, 2] will create an int[ ]. If all elements are Number (but of different classes), a Number[ ] will be returned. If all attempts fail, an Object[ ] is returned.

Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlArithmetic.java
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ArrayLiteralTest.java

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlArithmetic.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlArithmetic.java?rev=834255&r1=834254&r2=834255&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlArithmetic.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl/JexlArithmetic.java Mon Nov 9 22:10:42 2009
@@ -16,6 +16,8 @@
*/
package org.apache.commons.jexl;

+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.math.BigInteger;

@@ -182,6 +184,59 @@
}

/**
+ * Given an array of objects, attempt to type it more strictly.
+ * <ul>
+ * <li>If all objects are of the same type, the array returned will be an array of that same type</li>
+ * <li>If all objects are Numbers, the array returned will be an array of Numbers</li>
+ * <li>If all objects are convertible to a primitive type, the array returned will be an array
+ * of the primitive type</li>
+ * </ul>
+ * @param untyped an untyped array
+ * @return the original array if the attempt to strictly type the array fails, a typed array otherwise
+ */
+ protected Object narrowArrayType(Object[] untyped) {
+ final int size = untyped.length;
+ Class<?> commonClass = null;
+ if (size > 0) {
+ // base common class on first entry
+ commonClass = untyped[0].getClass();
+ final boolean isNumber = Number.class.isAssignableFrom(commonClass);
+ // for all children after first...
+ for (int i = 1; i < size; i++) {
+ Class<?> eclass = untyped[i].getClass();
+ // detect same type for all elements in array
+ if (!Object.class.equals(commonClass) && !commonClass.equals(eclass)) {
+ // if both are numbers...
+ if (isNumber && Number.class.isAssignableFrom(eclass)) {
+ commonClass = Number.class;
+ } else {
+ commonClass = Object.class;
+ }
+ }
+ }
+ // convert array to the common class if not Object.class
+ if (!Object.class.equals(commonClass)) {
+ // if the commonClass has an equivalent primitive type, get it
+ if (isNumber) {
+ try {
+ Field TYPE = commonClass.getField("TYPE");
+ commonClass = (Class<?>) TYPE.get(null);
+ } catch (Exception xany) {
+ // ignore
+ }
+ }
+ // allocate and fill up the typed array
+ Object typed = Array.newInstance(commonClass, size);
+ for(int i = 0; i < size; ++i) {
+ Array.set(typed, i, untyped[i]);
+ }
+ return typed;
+ }
+ }
+ return untyped;
+ }
+
+ /**
* Add two values together.
* 
* If any numeric add fails on coercion to the appropriate type,

Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ArrayLiteralTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ArrayLiteralTest.java?rev=834255&r1=834254&r2=834255&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ArrayLiteralTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl/ArrayLiteralTest.java Mon Nov 9 22:10:42 2009
@@ -19,7 +19,7 @@
import java.util.Arrays;

/**
- * Tests for map literals
+ * Tests for array literals
* @since 2.0
*/
public class ArrayLiteralTest extends JexlTestCase {
@@ -43,14 +43,23 @@
}

public void testLiteralWithNumbers() throws Exception {
- Expression e = JEXL.createExpression( "[ 5 , 10 ]" );
+ Expression e = JEXL.createExpression( "[ 5.0 , 10 ]" );
JexlContext jc = JexlHelper.createContext();

Object o = e.evaluate( jc );
- Object[] check = { Integer.valueOf(5), Integer.valueOf(10) };
+ Object[] check = { new Float(5), new Integer(10) };
assertTrue( Arrays.equals(check, (Object[])o) );
}

+ public void testLiteralWithIntegers() throws Exception {
+ Expression e = JEXL.createExpression( "[ 5 , 10 ]" );
+ JexlContext jc = JexlHelper.createContext();
+
+ Object o = e.evaluate( jc );
+ int[] check = { 5, 10 };
+ assertTrue( Arrays.equals(check, (int[])o) );
+ }
+
public void testSizeOfSimpleArrayLiteral() throws Exception {
Expression e = JEXL.createExpression( "size([ 'foo' , 'bar' ])" );
JexlContext jc = JexlHelper.createContext();

svn commit: r834248 - /commons/sandbox/runtime/trunk/src/main/native/configure

2009-11-09T13:48:01Z

Author: mturk
Date: Mon Nov 9 21:48:00 2009
New Revision: 834248

URL: http://svn.apache.org/viewvc?rev=834248&view=rev
Log:
Add multiarch support for configure files

Modified:
commons/sandbox/runtime/trunk/src/main/native/configure

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=834248&r1=834247&r2=834248&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Mon Nov 9 21:48:00 2009
@@ -431,8 +431,8 @@
mcpu="_`toupper $mach`_"
case "$host-$cc" in
linux-gcc )
- varadds cppopts -DLINUX=2 -D_GNU_SOURCE
- varadds cppopts -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED -D$mcpu
+ varadds cppopts -DLINUX=2 -D_GNU_SOURCE -D$mcpu -D__CC$bits
+ varadds cppopts -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED
varadds ccflags -fPIC -O3 -Wall -g
varadds asflags -c -fPIC -g -D$mcpu
varadds ldflags -lrt -lpthread -ldl
@@ -445,8 +445,8 @@
if [ ".$mach" = .i386 ]; then
varadds ccflags -fast -xbuiltin=none -U__MATHERR_ERRNO_DONTCARE -xnolibmopt -xnolibmil
fi
- varadds cppopts -D_LINUX=2 -D_GNU_SOURCE
- varadds cppopts -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED -D$mcpu
+ varadds cppopts -D_LINUX=2 -D_GNU_SOURCE -D$mcpu -D__CC$bits
+ varadds cppopts -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED
varadds ccflags -xstrconst -xdepend -O -Xa -KPIC
varadds asflags -c -KPIC -D$mcpu
varadds ldflags -lpthread -ldl
@@ -459,7 +459,7 @@
;;
darwin-gcc )
r="`uname -r | sed 's/\.//g'`"
- varadds cppopts -DDARWIN=$r -D$mcpu
+ varadds cppopts -DDARWIN=$r -D$mcpu -D__CC$bits
varadds ccflags -fPIC -O3 -g
varadds asflags -c -fPIC -g -D$mcpu
varadds ldflags -lpthread -ldl
@@ -477,7 +477,7 @@
varadds ccflags -fast -xbuiltin=none -U__MATHERR_ERRNO_DONTCARE -xnolibmopt -xnolibmil
test ".$bits" = .64 && varadds asflags -xarch=amd64
fi
- varadds cppopts -DSOLARIS2=$r -D$mcpu
+ varadds cppopts -DSOLARIS2=$r -D$mcpu -D__CC$bits
if [ ".$has_native_threads" = .yes ]; then
varadds ccflags -mt
varadds cppopts -DHAS_NATIVE_THREADS
@@ -495,7 +495,7 @@
;;
hpux-cc )
r="`uname -r | sed 's/[A-Z].[0-9]*.//'`"
- varadds cppopts -D_HPUX_SOURCE -DHPUX11=$r -D$mcpu
+ varadds cppopts -D_HPUX_SOURCE -DHPUX11=$r -D$mcpu -D__CC$bits
varadds ccflags -Ae +O2 -z +Z
varadds asflags -c +Z -D$mcpu
varadds ldflags -lrt -lpthread -ldld -lm
@@ -509,7 +509,7 @@
varadds asflags -nologo -DWIN32 -DWINNT -D_WIN32 -D$mcpu
varadds ccflags -nologo -O2 -Ob2 -Oy- -Zi -D_MD -MD -W3
varadds cppopts -DWIN32 -DWINNT -D_WIN32 -D_WINDOWS -D_WINNT
- varadds cppopts -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0600 -D$mcpu
+ varadds cppopts -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0600 -D$mcpu -D__CC$bits
varadds cxxopts -TP
varadds ldflags kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
varadds ldflags shell32.lib rpcrt4.lib user32.lib gdi32.lib userenv.lib wtsapi32.lib
@@ -529,7 +529,7 @@
;;
aix-gcc )
r="`uname -v``uname -r`"
- varadds cppopts -DAIX=$r -U__STR__ -D_THREAD_SAFE -D_USE_IRS -D$mcpu
+ varadds cppopts -DAIX=$r -U__STR__ -D_THREAD_SAFE -D_USE_IRS -D$mcpu -D__CC$bits
varadds ccflags -fPIC -O2 -g -pthread
varadds ldflags -lrt -lpthreads -lnsl
varadds shflags -shared -fPIC -Wl,-soname '-Wl,??@' -Wl,-brtl
@@ -978,6 +978,22 @@
cat > $topdir/include/acr_config.h << EOF
/*
* AUTOMATICALLY GENERATED BY CONFIGURE SCRIPT -- DO NOT EDIT
+ *
+ * This file is here to prevent a file conflict on multiarch systems.
+ */
+
+#if defined(__CC32)
+#include "acr_cc32.h"
+#elif defined(__CC64)
+#include "acr_cc64.h"
+#else
+#error "This package does not work with your architecture"
+#endif
+EOF
+
+cat > $topdir/include/acr_cc$bits.h << EOF
+/*
+ * AUTOMATICALLY GENERATED BY CONFIGURE SCRIPT -- DO NOT EDIT
*/
#ifndef _ACR_CONFIG_H
#define _ACR_CONFIG_H
@@ -1055,10 +1071,6 @@
#define CC_SIZEOF_OFF64_T $sizeof_off64_t
#define CC_IS_BIG_ENDIAN $bige

-EOF
-
-cat >> $topdir/include/acr_config.h << EOF
-
#ifdef __cplusplus
}
#endif

svn commit: r834243 - in /commons/sandbox/runtime/trunk/src/main/native: configure include/acr_string.h os/darwin/env.c os/hpux/env.c os/linux/env.c os/win32/dir.c os/win32/env.c

2009-11-09T13:20:40Z

Author: mturk
Date: Mon Nov 9 21:20:39 2009
New Revision: 834243

URL: http://svn.apache.org/viewvc?rev=834243&view=rev
Log:
Use strdup replacement where possible

Modified:
commons/sandbox/runtime/trunk/src/main/native/configure
commons/sandbox/runtime/trunk/src/main/native/include/acr_string.h
commons/sandbox/runtime/trunk/src/main/native/os/darwin/env.c
commons/sandbox/runtime/trunk/src/main/native/os/hpux/env.c
commons/sandbox/runtime/trunk/src/main/native/os/linux/env.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/dir.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/env.c

Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=834243&r1=834242&r2=834243&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Mon Nov 9 21:20:39 2009
@@ -968,7 +968,7 @@
fi

if [ ".$cc" = .gcc ]; then
- if [ ${cc_ver_major}${cc_ver_minor}0 -gt 410 ]; then
+ if [ ${cc_ver_major}${cc_ver_minor}0 -gt 400 ]; then
varadds cppopts -DUSE_ATOMICS_BUILTINS
fi
fi

Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_string.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_string.h?rev=834243&r1=834242&r2=834243&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_string.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_string.h Mon Nov 9 21:20:39 2009
@@ -158,7 +158,14 @@
* @return Pointer to duplicated string.
*/
ACR_DECLARE(char *) ACR_StrdupA(JNIEnv *env, const char *file, int line,
- const char *s);
+ const char *str);
+
+/**
+ * Apache's "replacement" for the strdup() function.
+ * @param str String to duplicate.
+ * @return Pointer to duplicated string.
+ */
+ACR_DECLARE(char *) ACR_strdup(const char *str);

/**
* Apache's "replacement" for the wcsdup() function that throws
@@ -170,7 +177,14 @@
* @return Pointer to duplicated string.
*/
ACR_DECLARE(wchar_t *) ACR_StrdupW(JNIEnv *env, const char *file, int line,
- const wchar_t *s);
+ const wchar_t *str);
+
+/**
+ * Apache's "replacement" for the wcsdup() function.
+ * @param str String to duplicate.
+ * @return Pointer to duplicated string.
+ */
+ACR_DECLARE(wchar_t *) ACR_wcsdup(const wchar_t *str);

/**
* Concatenate string.

Modified: commons/sandbox/runtime/trunk/src/main/native/os/darwin/env.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/darwin/env.c?rev=834243&r1=834242&r2=834243&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/darwin/env.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/darwin/env.c Mon Nov 9 21:20:39 2009
@@ -25,7 +25,7 @@

ACR_DECLARE(char *) ACR_EnvGet(const char *var)
{
- return ACR_StrdupA(INVALID_HANDLE_VALUE, THROW_NMARK, getenv(var));
+ return ACR_strdup(getenv(var));
}

ACR_DECLARE(int) ACR_EnvHas(const char *var)

Modified: commons/sandbox/runtime/trunk/src/main/native/os/hpux/env.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/hpux/env.c?rev=834243&r1=834242&r2=834243&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/hpux/env.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/hpux/env.c Mon Nov 9 21:20:39 2009
@@ -24,7 +24,7 @@

ACR_DECLARE(char *) ACR_EnvGet(const char *var)
{
- return ACR_StrdupA(INVALID_HANDLE_VALUE, THROW_NMARK, getenv(var));
+ return ACR_strdup(getenv(var));
}

ACR_DECLARE(int) ACR_EnvHas(const char *var)

Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/env.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/env.c?rev=834243&r1=834242&r2=834243&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/env.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/env.c Mon Nov 9 21:20:39 2009
@@ -25,7 +25,7 @@

ACR_DECLARE(char *) ACR_EnvGet(const char *var)
{
- return ACR_StrdupA(INVALID_HANDLE_VALUE, THROW_NMARK, getenv(var));
+ return ACR_strdup(getenv(var));
}

ACR_DECLARE(int) ACR_EnvHas(const char *var)

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/dir.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/dir.c?rev=834243&r1=834242&r2=834243&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/dir.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/dir.c Mon Nov 9 21:20:39 2009
@@ -186,7 +186,7 @@
return 0;
if (rc == ERROR_PATH_NOT_FOUND) { /* Missing an intermediate dir */
wchar_t *pos;
- wchar_t *dir = ACR_StrdupW(INVALID_HANDLE_VALUE, THROW_NMARK, name);
+ wchar_t *dir = ACR_wcsdup(name);
if (!dir)
return ACR_ENOMEM;
if ((pos = wcsrchr(dir, L'\\'))) {

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/env.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/env.c?rev=834243&r1=834242&r2=834243&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/env.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/env.c Mon Nov 9 21:20:39 2009
@@ -150,7 +150,7 @@
return buf;
}
}
- return ACR_StrdupA(INVALID_HANDLE_VALUE, THROW_NMARK, env);
+ return ACR_strdup(env);
}

ACR_DECLARE(int) ACR_EnvHas(const char *var)
@@ -252,7 +252,7 @@
return buf;
}
}
- return ACR_StrdupW(INVALID_HANDLE_VALUE, THROW_NMARK, env);
+ return ACR_wcsdup(env);
}

int acr_EnvSetW(const wchar_t *var, const wchar_t *val)

Re: [VOTE] Release BeanUtils 1.8.2 based on RC1

2009-11-09T13:07:00Z

+1 Looks good!

Oliver

Niall Pemberton schrieb:

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

RE: [vfs] JDK 1.5

2009-11-09T12:44:41Z

> -----Original Message-----
> From: Ralph Goers [mailto:ralph.goers@...]
> Sent: Sunday, November 08, 2009 23:34
> To: Commons Developers List
> Subject: Re: [vfs] JDK 1.5
>
>
> On Nov 8, 2009, at 10:24 PM, Jörg Schaible wrote:
>
> > Guys,
> >
> > looking at Ralph's comment in
> https://issues.apache.org/jira/browse/VFS-254
> > I am questionning myself, if there's any reason why vfs 2.0 should
> > still
> > have JDK 1.4 as requirement and not JDK 1.5. VFS 2.0 will be a major
> > release and JDK 1.7 is years away to be used for our conservative
> > customers. Although we have still some maintenance support for JDK
> > 1.4-based apps, they're phasing out and we will definitely not update
> > dependencies with major releases. Therefore I'd rather have a VFS
> > with more
> > modern API (generics) in 2.0 than an "old-fashioned" version 2.0
> > based on
> > JDK 1.4 especially if the major release means that API changes too
> > much for
> > a drop in replacement of 1.1. Thoughts ?
> >
>
>
> Actually, there was a poll on the dev list in august and no one
> objected to moving to JDK 5. I have no problem with changing the
> compile and target versions to Java 5 but I would really like to see
> 2.0 released asap. I'm already using it in production and from
> comments I've seen I'm pretty sure others are as well. At this point I
> think it would be good to keep the changes on 2.0 to a minimum

If the upgrade to Java 5 does not introduce new issues, I say go for it.

>
> I made changes on the VFS281 branch that require Java 5 as the minimum
> version internally but doesn't break compatibility in any other way. I
> haven't merged that to trunk because I asked for feedback and got
> none. At this point I'm prepared to go out with 2.0 without this and
> then consider adding it to whatever the next release is going to be.

I like the "release early, release often" XP mantra. If we can get a 2.1 with Java 5 support right behind 2.0, that would be OK with me too. The idea would be to release 2.0 and release 2.1 ASAP just to move development onto a more modern platform.

Gary

>
> To me, the primary concern is getting 2.0 released and there are still
> a ton of Jira issues, many with patches, that I haven't had a chance
> to look at. I took a stab at applying some easy ones over the last few
> days, but there are some that deal with issues findbugs found that
> probably should be addressed.
>
> Ralph
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [VOTE] Release BeanUtils 1.8.1 based on RC1

2009-11-09T11:32:10Z

On Wed, Oct 14, 2009 at 3:24 AM, Rahul Akolkar <rahul.akolkar@...> wrote:

> On Thu, Oct 8, 2009 at 10:31 AM, Niall Pemberton
> <niall.pemberton@...> wrote:
>> We have fixed a number of bugs since BeanUtils 1.8.0 was released a
>> year ago and I'd like to release BeanUtils 1.8.1
>>
>> [X] +1 Yes go ahead an release based on RC1
>> [ ] -1 No, because...
>>
> <snip/>
>
> Nits include release notes formatting (line width) and perhaps using
> different product names in the NOTICE files for the "other" jars.

Rahul,

I did look at this comment before the 1.8.2 release - wrt to the
NOTICE file I'd rather not maintain 3 copies of it for each of the
jars.

Niall

> -Rahul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

[VOTE] Release BeanUtils 1.8.2 based on RC1

2009-11-09T11:06:40Z

One of the bugs (BEANUTILS-345) fixed in BeanUtils 1.8.1 has resulted
in a new bug (BEANUTILS-368) so I'd like to release BeanUtils 1.8.2 to
fix this problem.

[ ] +1 Yes go ahead an release based on RC1
[ ] -1 No, because...

BeanUtils 1.8.2 RC1 is available for review here:
http://people.apache.org/~niallp/beanutils-1.8.2-rc1/

Maven artifacts are here:
http://people.apache.org/~niallp/beanutils-1.8.2-rc1/maven/commons-beanutils/

Details of changes since 1.8.1 are in the release notes:
http://people.apache.org/~niallp/beanutils-1.8.2-rc1/RELEASE-NOTES.txt
http://people.apache.org/~niallp/beanutils-1.8.2-rc1/site/changes-report.html

I have tested this with JDK 1.3 & 1.4 using ant and JDK 1.5 & 1.6 using maven2.

The tag is here:
http://svn.apache.org/viewvc/commons/proper/beanutils/tags/BEANUTILS_1_8_2_RC1/

Site:
http://people.apache.org/~niallp/beanutils-1.8.2-rc1/site/
(note some *relative* links are broken and the 1.8.2 directories are
not yet created - these will be OK once the site is deployed)

Clirr Report (compared to 1.8.0):
http://people.apache.org/~niallp/beanutils-1.8.2-rc1/site/clirr-report.html

RAT Report:
http://people.apache.org/~niallp/beanutils-1.8.2-rc1/site/rat-report.html

tia

Niall

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [dbcp] Callable statement pooling (DBCP-204)

2009-11-09T06:25:00Z

Phil Steitz wrote:
> OK, I am now feeling stupid.
You and me both.

> GKOP already has LRU-cache like
> behavior. (See clearOldest test in allocate()). Given compat
> issues, I am inclined to move forward with 0).

+1

We'll also need pool 1.5.4 as well to fix an edge case where the pool
could lock up.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834072 - in /commons/sandbox/runtime/trunk/src/main/native/os: darwin/arch.S linux/arch.S

2009-11-09T06:09:36Z

Author: mturk
Date: Mon Nov 9 14:09:32 2009
New Revision: 834072

URL: http://svn.apache.org/viewvc?rev=834072&view=rev
Log:
Fix typos

Modified:
commons/sandbox/runtime/trunk/src/main/native/os/darwin/arch.S
commons/sandbox/runtime/trunk/src/main/native/os/linux/arch.S

Modified: commons/sandbox/runtime/trunk/src/main/native/os/darwin/arch.S
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/darwin/arch.S?rev=834072&r1=834071&r2=834072&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/darwin/arch.S (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/darwin/arch.S Mon Nov 9 14:09:32 2009
@@ -16,7 +16,7 @@

.text
.align 4
-#if defined(_XI386_)
+#if defined(_I386_)
/*
* extern acr_uint32_t acr_AtomicAdd32(acr_atomic32_t *, acr_uint32_t)
*/

Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/arch.S
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/arch.S?rev=834072&r1=834071&r2=834072&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/arch.S (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/arch.S Mon Nov 9 14:09:32 2009
@@ -16,7 +16,7 @@

.text

-#if defined(_XI386_)
+#if defined(_I386_)
.align 8

/*

svn commit: r834069 - in /commons/sandbox/runtime/trunk: build.xml src/main/native/configure.xml

2009-11-09T06:01:52Z

Author: mturk
Date: Mon Nov 9 14:01:44 2009
New Revision: 834069

URL: http://svn.apache.org/viewvc?rev=834069&view=rev
Log:
Use info insted print as custom task name

Modified:
commons/sandbox/runtime/trunk/build.xml
commons/sandbox/runtime/trunk/src/main/native/configure.xml

Modified: commons/sandbox/runtime/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/build.xml?rev=834069&r1=834068&r2=834069&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/build.xml (original)
+++ commons/sandbox/runtime/trunk/build.xml Mon Nov 9 14:01:44 2009
@@ -195,7 +195,7 @@
classname="${build.package.name}.ant.ConditionalExecTask">
<classpath refid="task.classpath"/>
</taskdef>
- <taskdef name="print"
+ <taskdef name="info"
classname="${build.package.name}.ant.FormattedEchoTask">
<classpath refid="task.classpath"/>
</taskdef>

Modified: commons/sandbox/runtime/trunk/src/main/native/configure.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure.xml?rev=834069&r1=834068&r2=834069&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure.xml (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure.xml Mon Nov 9 14:01:44 2009
@@ -97,7 +97,7 @@
classname="${build.package.name}.ant.ConditionalExecTask">
<classpath refid="task.classpath"/>
</taskdef>
- <taskdef name="print"
+ <taskdef name="info"
classname="${build.package.name}.ant.FormattedEchoTask">
<classpath refid="task.classpath"/>
</taskdef>
@@ -136,7 +136,7 @@
</fileset>
</delete>
<property name="@{result}" value="0"/>
- <print format="%1$-45s %2$s" message="Checking for sizeof(@{type}) : ${@{result}}"/>
+ <info format="%1$-45s %2$s" message="Checking for sizeof(@{type}) : ${@{result}}"/>
</sequential>
</macrodef>

@@ -170,7 +170,7 @@
</fileset>
</delete>
<property name="@{result}" value="0"/>
- <print format="%1$-45s %2$s" message="Checking for <@{file}.h> : ${have.res}"/>
+ <info format="%1$-45s %2$s" message="Checking for <@{file}.h> : ${have.res}"/>
</sequential>
</macrodef>

@@ -203,7 +203,7 @@
</fileset>
</delete>
<property name="@{result}" value="0"/>
- <print format="%1$-45s %2$s" message="Checking for @{file} library : ${have.res}"/>
+ <info format="%1$-45s %2$s" message="Checking for @{file} library : ${have.res}"/>
</sequential>
</macrodef>

@@ -265,6 +265,6 @@
<have-library file="bufferoverflow"/>
<have-library file="ktmw32"/>
</sequence>
- <print format="#define HAVE_WINDOWS_H %1s" message="${config.have.windows}"/>
+ <info format="#define HAVE_WINDOWS_H %1s" message="${config.have.windows}"/>
</target>
</project>

svn commit: r834066 - /commons/sandbox/runtime/trunk/src/main/native/shared/string.c

2009-11-09T05:58:59Z

Author: mturk
Date: Mon Nov 9 13:58:55 2009
New Revision: 834066

URL: http://svn.apache.org/viewvc?rev=834066&view=rev
Log:
Add strdup replacements that use x_malloc

Modified:
commons/sandbox/runtime/trunk/src/main/native/shared/string.c

Modified: commons/sandbox/runtime/trunk/src/main/native/shared/string.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/string.c?rev=834066&r1=834065&r2=834066&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/string.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/string.c Mon Nov 9 13:58:55 2009
@@ -741,6 +741,22 @@
return s ? ++s : pathname;
}

+ACR_DECLARE(char *) ACR_strdup(const char *s)
+{
+ char *d = NULL;
+ if (s) {
+ size_t size = strlen(s);
+ d = x_malloc(size + 1);
+ if (d) {
+ memcpy(d, s, size);
+ d[size] = '\0';
+ }
+ else
+ ACR_SET_OS_ERROR(ACR_ENOMEM);
+ }
+ return d;
+}
+
ACR_DECLARE(char *) ACR_StrdupA(JNIEnv *_E, const char *file, int line,
const char *s)
{
@@ -756,6 +772,22 @@
return d;
}

+ACR_DECLARE(wchar_t *) ACR_wcsdup(const wchar_t *s)
+{
+ wchar_t *d = NULL;
+ if (s) {
+ size_t size = wcslen(s);
+ d = x_malloc((size + 1) * sizeof(wchar_t));
+ if (d) {
+ memcpy(d, s, size * sizeof(wchar_t));
+ d[size] = L'\0';
+ }
+ else
+ ACR_SET_OS_ERROR(ACR_ENOMEM);
+ }
+ return d;
+}
+
ACR_DECLARE(wchar_t *) ACR_StrdupW(JNIEnv *_E, const char *file, int line,
const wchar_t *s)
{

svn commit: r834064 - /commons/proper/beanutils/tags/BEANUTILS_1_8_2_RC1/

2009-11-09T05:55:55Z

Author: niallp
Date: Mon Nov 9 13:55:53 2009
New Revision: 834064

URL: http://svn.apache.org/viewvc?rev=834064&view=rev
Log:
Tag BeanUtils 1.8.2 RC1

Added:
commons/proper/beanutils/tags/BEANUTILS_1_8_2_RC1/
- copied from r834063, commons/proper/beanutils/trunk/

svn commit: r834063 - in /commons/proper/beanutils/trunk: build.xml pom.xml project.xml

2009-11-09T05:54:30Z

Author: niallp
Date: Mon Nov 9 13:54:26 2009
New Revision: 834063

URL: http://svn.apache.org/viewvc?rev=834063&view=rev
Log:
Update version number from 1.8.2-SNAPSHOT to 1.8.2

Modified:
commons/proper/beanutils/trunk/build.xml
commons/proper/beanutils/trunk/pom.xml
commons/proper/beanutils/trunk/project.xml

Modified: commons/proper/beanutils/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/build.xml?rev=834063&r1=834062&r2=834063&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/build.xml (original)
+++ commons/proper/beanutils/trunk/build.xml Mon Nov 9 13:54:26 2009
@@ -44,7 +44,7 @@
<property name="component.title" value="Bean Introspection Utilities"/>


- <property name="component.version" value="1.8.2-SNAPSHOT"/>
+ <property name="component.version" value="1.8.2"/>


<property name="build.home" value="target"/>

Modified: commons/proper/beanutils/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/pom.xml?rev=834063&r1=834062&r2=834063&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/pom.xml (original)
+++ commons/proper/beanutils/trunk/pom.xml Mon Nov 9 13:54:26 2009
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.8.2-SNAPSHOT</version>
+ <version>1.8.2</version>
<name>Commons BeanUtils</name>

<inceptionYear>2000</inceptionYear>

Modified: commons/proper/beanutils/trunk/project.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/project.xml?rev=834063&r1=834062&r2=834063&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/project.xml (original)
+++ commons/proper/beanutils/trunk/project.xml Mon Nov 9 13:54:26 2009
@@ -20,7 +20,7 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<name>BeanUtils</name>
- <currentVersion>1.8.2-SNAPSHOT</currentVersion>
+ <currentVersion>1.8.2</currentVersion>
<inceptionYear>2000</inceptionYear>
<shortDescription>Commons BeanUtils</shortDescription>
<description>BeanUtils provides an easy-to-use but flexible wrapper around reflection and introspection.</description>

svn commit: r834060 - in /commons/proper/beanutils/trunk: pom.xml src/site/site.xml xdocs/download_beanutils.xml xdocs/index.xml xdocs/navigation.xml

2009-11-09T05:47:48Z

Author: niallp
Date: Mon Nov 9 13:47:44 2009
New Revision: 834060

URL: http://svn.apache.org/viewvc?rev=834060&view=rev
Log:
Prepare site for BeanUtils 1.8.2 release

Modified:
commons/proper/beanutils/trunk/pom.xml
commons/proper/beanutils/trunk/src/site/site.xml
commons/proper/beanutils/trunk/xdocs/download_beanutils.xml
commons/proper/beanutils/trunk/xdocs/index.xml
commons/proper/beanutils/trunk/xdocs/navigation.xml

Modified: commons/proper/beanutils/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/pom.xml?rev=834060&r1=834059&r2=834060&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/pom.xml (original)
+++ commons/proper/beanutils/trunk/pom.xml Mon Nov 9 13:47:44 2009
@@ -241,7 +241,7 @@
<maven.compile.source>1.3</maven.compile.source>
<maven.compile.target>1.3</maven.compile.target>
<commons.componentid>beanutils</commons.componentid>
- <commons.release.version>1.8.1</commons.release.version>
+ <commons.release.version>1.8.2</commons.release.version>
<commons.jira.id>BEANUTILS</commons.jira.id>
<commons.jira.pid>12310460</commons.jira.pid>
<commons.osgi.export>

Modified: commons/proper/beanutils/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/site/site.xml?rev=834060&r1=834059&r2=834060&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/site/site.xml (original)
+++ commons/proper/beanutils/trunk/src/site/site.xml Mon Nov 9 13:47:44 2009
@@ -37,6 +37,11 @@
<item name="Building" href="/building.html"/>

<item name="Wiki" href="http://wiki.apache.org/commons/BeanUtils"/>
+ <item name="1.8.2">
+ <item name="Release Notes" href='http://commons.apache.org/beanutils/v1.8.2/RELEASE-NOTES.txt'/>
+ <item name="User Guide" href="http://commons.apache.org/beanutils/v1.8.2/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
+ <item name="API" href="http://commons.apache.org/beanutils/v1.8.2/apidocs/index.html"/>
+ </item>
<item name="1.8.1">
<item name="Release Notes" href='http://commons.apache.org/beanutils/v1.8.1/RELEASE-NOTES.txt'/>
<item name="User Guide" href="http://commons.apache.org/beanutils/v1.8.1/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>

Modified: commons/proper/beanutils/trunk/xdocs/download_beanutils.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/xdocs/download_beanutils.xml?rev=834060&r1=834059&r2=834060&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/xdocs/download_beanutils.xml (original)
+++ commons/proper/beanutils/trunk/xdocs/download_beanutils.xml Mon Nov 9 13:47:44 2009
@@ -102,17 +102,17 @@
<ul class="downloads">
<li class="group"><div class="links">Binary</div>
<ul>
- <li class="download"><a href="[preferred]/commons/beanutils/binaries/commons-beanutils-1.8.1-bin.tar.gz">1.8.1.tar.gz</a>
+ <li class="download"><a href="[preferred]/commons/beanutils/binaries/commons-beanutils-1.8.2-bin.tar.gz">1.8.2.tar.gz</a>
<ul class="attributes">
- <li>[<a href="http://www.apache.org/dist/commons/beanutils/binaries/commons-beanutils-1.8.1-bin.tar.gz.md5">md5</a>]
- [<a href="http://www.apache.org/dist/commons/beanutils/binaries/commons-beanutils-1.8.1-bin.tar.gz.asc">pgp</a>]
+ <li>[<a href="http://www.apache.org/dist/commons/beanutils/binaries/commons-beanutils-1.8.2-bin.tar.gz.md5">md5</a>]
+ [<a href="http://www.apache.org/dist/commons/beanutils/binaries/commons-beanutils-1.8.2-bin.tar.gz.asc">pgp</a>]
</li>
</ul>
</li>
- <li class="download"><a href="[preferred]/commons/beanutils/binaries/commons-beanutils-1.8.1-bin.zip">1.8.1.zip</a>
+ <li class="download"><a href="[preferred]/commons/beanutils/binaries/commons-beanutils-1.8.2-bin.zip">1.8.2.zip</a>
<ul class="attributes">
- <li>[<a href="http://www.apache.org/dist/commons/beanutils/binaries/commons-beanutils-1.8.1-bin.zip.md5">md5</a>]
- [<a href="http://www.apache.org/dist/commons/beanutils/binaries/commons-beanutils-1.8.1-bin.zip.asc">pgp</a>]
+ <li>[<a href="http://www.apache.org/dist/commons/beanutils/binaries/commons-beanutils-1.8.2-bin.zip.md5">md5</a>]
+ [<a href="http://www.apache.org/dist/commons/beanutils/binaries/commons-beanutils-1.8.2-bin.zip.asc">pgp</a>]
</li>
</ul>
</li>
@@ -120,17 +120,17 @@
</li>
<li class="group"><div class="links">Source</div>
<ul>
- <li class="download"><a href="[preferred]/commons/beanutils/source/commons-beanutils-1.8.1-src.tar.gz">1.8.1.tar.gz</a>
+ <li class="download"><a href="[preferred]/commons/beanutils/source/commons-beanutils-1.8.2-src.tar.gz">1.8.2.tar.gz</a>
<ul class="attributes">
- <li>[<a href="http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-1.8.1-src.tar.gz.md5">md5</a>]
- [<a href="http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-1.8.1-src.tar.gz.asc">pgp</a>]
+ <li>[<a href="http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-1.8.2-src.tar.gz.md5">md5</a>]
+ [<a href="http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-1.8.2-src.tar.gz.asc">pgp</a>]
</li>
</ul>
</li>
- <li class="download"><a href="[preferred]/commons/beanutils/source/commons-beanutils-1.8.1-src.zip">1.8.1.zip</a>
+ <li class="download"><a href="[preferred]/commons/beanutils/source/commons-beanutils-1.8.2-src.zip">1.8.2.zip</a>
<ul class="attributes">
- <li>[<a href="http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-1.8.1-src.zip.md5">md5</a>]
- [<a href="http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-1.8.1-src.zip.asc">pgp</a>]
+ <li>[<a href="http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-1.8.2-src.zip.md5">md5</a>]
+ [<a href="http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-1.8.2-src.zip.asc">pgp</a>]
</li>
</ul>
</li>

Modified: commons/proper/beanutils/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/xdocs/index.xml?rev=834060&r1=834059&r2=834060&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/xdocs/index.xml (original)
+++ commons/proper/beanutils/trunk/xdocs/index.xml Mon Nov 9 13:47:44 2009
@@ -102,6 +102,17 @@

<section name="Releases">
+<subsection name="1.8.2">
+
+BeanUtils 1.8.2 is binary compatible with version 1.8.1 and contains
+<a href="http://commons.apache.org/beanutils/v1.8.2/RELEASE-NOTES.txt">
+bug fixes</a> for 1.8.1. BeanUtils 1.8.2 requires a minimum of JDK 1.3.
+
+
+BeanUtils 1.8.2 is available to download
+<a href="http://commons.apache.org/beanutils/download_beanutils.cgi">here</a>.
+
+</subsection>
<subsection name="1.8.1">

BeanUtils 1.8.1 is binary compatible with version 1.8.0
@@ -109,10 +120,6 @@
<a href="http://commons.apache.org/beanutils/v1.8.1/RELEASE-NOTES.txt">
bug fixes</a> for 1.8.0. BeanUtils 1.8.1 requires a minimum of JDK 1.3.

-
-BeanUtils 1.8.1 is available to download
-<a href="http://commons.apache.org/beanutils/download_beanutils.cgi">here</a>.
-
</subsection>
<subsection name="1.8.0">


Modified: commons/proper/beanutils/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/xdocs/navigation.xml?rev=834060&r1=834059&r2=834060&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/xdocs/navigation.xml (original)
+++ commons/proper/beanutils/trunk/xdocs/navigation.xml Mon Nov 9 13:47:44 2009
@@ -44,6 +44,12 @@
<item name="Building" href="/building.html"/>
<item name="Wiki" href="http://wiki.apache.org/commons/BeanUtils"/>

+ <item name="1.8.2">
+ <item name="Release Notes" href='http://commons.apache.org/beanutils/v1.8.2/RELEASE-NOTES.txt'/>
+ <item name="User Guide" href="http://commons.apache.org/beanutils/v1.8.2/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
+ <item name="API" href="http://commons.apache.org/beanutils/v1.8.2/apidocs/index.html"/>
+ </item>
+
<item name="1.8.1">
<item name="Release Notes" href='http://commons.apache.org/beanutils/v1.8.1/RELEASE-NOTES.txt'/>
<item name="User Guide" href="http://commons.apache.org/beanutils/v1.8.1/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>

[GUMP@vmgump]: Project commons-jelly-tags-fmt-test (in module commons-jelly) failed

2009-11-09T04:43:57Z

To whom it may engage...

This is an automated request, but not an unsolicited one. For
more information please visit http://gump.apache.org/nagged.html,
and/or contact the folk at general@....

Project commons-jelly-tags-fmt-test has an issue affecting its community integration.
This issue affects 1 projects,
and has been outstanding for 6 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- commons-jelly-tags-fmt-test : Commons Jelly

Full details are available at:
http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-fmt-test/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were provided:
-DEBUG- Dependency on xml-xerces exists, no need to add for property maven.jar.xerces.
-WARNING- Overriding Maven properties: [/srv/gump/public/workspace/commons-jelly/jelly-tags/fmt/build.properties]
-DEBUG- (Gump generated) Maven Properties in: /srv/gump/public/workspace/commons-jelly/jelly-tags/fmt/build.properties
-INFO- Failed with reason build failed
-DEBUG- Maven POM in: /srv/gump/public/workspace/commons-jelly/jelly-tags/fmt/project.xml
-DEBUG- Maven project properties in: /srv/gump/public/workspace/commons-jelly/jelly-tags/fmt/project.properties
-INFO- Project Reports in: /srv/gump/public/workspace/commons-jelly/jelly-tags/fmt/target/test-reports

The following work was performed:
http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-fmt-test/gump_work/build_commons-jelly_commons-jelly-tags-fmt-test.html
Work Name: build_commons-jelly_commons-jelly-tags-fmt-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 4 secs
Command Line: maven --offline jar
[Working Directory: /srv/gump/public/workspace/commons-jelly/jelly-tags/fmt]
CLASSPATH: /usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/ant/dist/lib/ant-trax.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/packages/bsh-2.0b4/bsh-commands-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-classpath-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-core-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-bsf-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-reflect-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-util-2.0b4.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-09112009.jar:/srv/gump/pu
blic/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-jelly/target/commons-jelly-09112009.jar:/srv/gump/public/workspace/commons-jelly/jelly-tags/ant/target/commons-jelly-tags-ant-09112009.jar:/srv/gump/public/workspace/commons-jelly/jelly-tags/beanshell/target/commons-jelly-tags-beanshell-09112009.jar:/srv/gump/public/workspace/commons-jelly/jelly-tags/junit/target/commons-jelly-tags-junit-09112009.jar:/srv/gump/public/workspace/apache-commons/jexl/target/commons-jexl-2.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-09112009.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-09112009.jar:/srv/gump/public/workspace/dom4j/build/dom4j.jar:/srv/gump/public/workspace/jaxen/target/jaxen-09112009.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis-ext.jar:/srv/gump/public/workspace/commons-jelly/jelly-tags/fmt/target/commons-jel
ly-tags-fmt-09112009.jar
---------------------------------------------
[junit] at org.apache.commons.jelly.tags.ant.AntTag.doTag(AntTag.java:111)
[junit] at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:267)
[junit] ... 11 more
[junit] Root cause
[junit] java.lang.NoClassDefFoundError: org/apache/tools/ant/Main
[junit] at org.apache.commons.jelly.tags.ant.AntTagLibrary.createProject(AntTagLibrary.java:128)
[junit] at org.apache.commons.jelly.tags.ant.AntTagLibrary.getProject(AntTagLibrary.java:96)
[junit] at org.apache.commons.jelly.tags.ant.AntTag.getAntProject(AntTag.java:310)
[junit] at org.apache.commons.jelly.tags.ant.AntTag.doTag(AntTag.java:111)
[junit] at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:267)
[junit] at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:96)
[junit] at org.apache.commons.jelly.tags.junit.CaseTag$1.runTest(CaseTag.java:60)
[junit]
[junit]
[junit] Testcase: testSetLocale(org.apache.commons.jelly.tags.junit.CaseTag$1): Caused an ERROR
[junit] file:/srv/gump/public/workspace/commons-jelly/jelly-tags/fmt/target/test-classes/org/apache/commons/jelly/tags/fmt/suite.jelly:116:17: <m:echo> org/apache/tools/ant/Main
[junit] org.apache.commons.jelly.JellyTagException: file:/srv/gump/public/workspace/commons-jelly/jelly-tags/fmt/target/test-classes/org/apache/commons/jelly/tags/fmt/suite.jelly:116:17: <m:echo> org/apache/tools/ant/Main
[junit] at org.apache.commons.jelly.impl.TagScript.handleException(TagScript.java:732)
[junit] at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:287)
[junit] at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:96)
[junit] at org.apache.commons.jelly.tags.junit.CaseTag$1.runTest(CaseTag.java:60)
[junit] Caused by: java.lang.NoClassDefFoundError: org/apache/tools/ant/Main
[junit] at org.apache.commons.jelly.tags.ant.AntTagLibrary.createProject(AntTagLibrary.java:128)
[junit] at org.apache.commons.jelly.tags.ant.AntTagLibrary.getProject(AntTagLibrary.java:96)
[junit] at org.apache.commons.jelly.tags.ant.AntTag.getAntProject(AntTag.java:310)
[junit] at org.apache.commons.jelly.tags.ant.AntTag.doTag(AntTag.java:111)
[junit] at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:267)
[junit] ... 11 more
[junit] Root cause
[junit] java.lang.NoClassDefFoundError: org/apache/tools/ant/Main
[junit] at org.apache.commons.jelly.tags.ant.AntTagLibrary.createProject(AntTagLibrary.java:128)
[junit] at org.apache.commons.jelly.tags.ant.AntTagLibrary.getProject(AntTagLibrary.java:96)
[junit] at org.apache.commons.jelly.tags.ant.AntTag.getAntProject(AntTag.java:310)
[junit] at org.apache.commons.jelly.tags.ant.AntTag.doTag(AntTag.java:111)
[junit] at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:267)
[junit] at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:96)
[junit] at org.apache.commons.jelly.tags.junit.CaseTag$1.runTest(CaseTag.java:60)
[junit]
[junit]
[junit] [ERROR] TEST org.apache.commons.jelly.tags.fmt.TestFMTSuite FAILED

BUILD FAILED
File...... /home/gump/.maven/cache/maven-test-plugin-1.6.2/plugin.jelly
Element... fail
Line...... 181
Column.... 54
There were test failures.
Total time: 4 seconds
Finished at: Mon Nov 09 04:43:57 PST 2009

---------------------------------------------

To subscribe to this information via syndicated feeds:
- RSS: http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-fmt-test/rss.xml
- Atom: http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-fmt-test/atom.xml

============================== Gump Tracking Only ===
Produced by Gump version 2.3.
Gump Run 06000009112009, vmgump:vmgump-public:06000009112009
Gump E-mail Identifier (unique within run) #56.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834031 - in /commons/proper/beanutils/trunk: RELEASE-NOTES.txt src/java/org/apache/commons/beanutils/BeanUtilsBean.java src/test/org/apache/commons/beanutils/bugs/Jira368TestCase.java xdocs/changes.xml

2009-11-09T04:26:52Z

Author: niallp
Date: Mon Nov 9 12:26:52 2009
New Revision: 834031

URL: http://svn.apache.org/viewvc?rev=834031&view=rev
Log:
BEANUTILS-368 Fix NullPointerException in BeanUtilsBean .setProperty() - thanks to Peter Fassev

Added:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira368TestCase.java (with props)
Modified:
commons/proper/beanutils/trunk/RELEASE-NOTES.txt
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
commons/proper/beanutils/trunk/xdocs/changes.xml

Modified: commons/proper/beanutils/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/RELEASE-NOTES.txt?rev=834031&r1=834030&r2=834031&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/beanutils/trunk/RELEASE-NOTES.txt Mon Nov 9 12:26:52 2009
@@ -17,7 +17,7 @@

Commons BeanUtils Package
- Version 1.8.1
+ Version 1.8.2
Release Notes

INTRODUCTION:
@@ -29,11 +29,11 @@
For more information on Commons BeanUtils, see
o http://commons.apache.org/beanutils/

-Compatibility with 1.8.0
+Compatibility with 1.8.1
========================
-BeanUtils 1.8.1 is binary compatible release with Beanutils 1.8.0, containing mostly bug fixes.
+BeanUtils 1.8.2 is binary compatible release with Beanutils 1.8.1, containing only bug fixes.

-BeanUtils 1.8.1 requires a minimum of JDK 1.3.
+BeanUtils 1.8.2 requires a minimum of JDK 1.3.

Memory Leak
===========
@@ -41,7 +41,7 @@
in BeanUtils 1.8.0 for JDK 1.5+.

Testing of BeanUtils 1.8.1 revealed that the leak still appears to exist
-(in both BeanUtils 1.8.0 and 1.8.1 versions) in IBM's JDK 1.6 implementation.
+(in BeanUtils 1.8.0, 1.8.1 and 1.8.2 versions) in IBM's JDK 1.6 implementation.

see http://issues.apache.org/jira/browse/BEANUTILS-291
@@ -53,22 +53,5 @@

The following is a list of the bugs fixed in this release, with their Jira issue number:

- * [BEANUTILS-300] - NPE in LazyDynaList
- * [BEANUTILS-327] - JDBCDynaClass throws class not found exception under java6
- * [BEANUTILS-336] - MappedPropertyDescriptor#reLoadClass() possible NPE / odd code; also swallows Throwable
- * [BEANUTILS-339] - BeanUtilsBean.setProperty throws IllegalArgumentException if value is null
- * [BEANUTILS-345] - BeanUtilsBean.setProperty does not handle some kind of nested properties
- * [BEANUTILS-347] - MappedPropertyDescriptor throws an exception after method reference has been garbage collected
- * [BEANUTILS-349] - copyProperties throws NullPointerException if an IllegalArgumentException is thrown due to a null value parameter for a primitive
- * [BEANUTILS-351] - FloatLocaleConverter cannot parse 0
- * [BEANUTILS-354] - Type in BooleanConverter: "Cna't convert value"
-
-
-ENHANCEMENTS:
-=============
-The following is a list of enhancements in this release, with their Jira issue number:
-
- * [BEANUTILS-333] - Avoid calling setAccessible() if not needed
- * [BEANUTILS-344] - Method createDynaProperty of JDBCDynaClass should first look for column label instead of column name in ResultSetMetadata object..
- * [BEANUTILS-350] - change visibility of method "evaluateValue" belongs to the class BeanPropertyValueEqualsPredicate to "protected".
+ * [BEANUTILS-368] - NullPointerException in BeanUtilsBean .setProperty()

Modified: commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java?rev=834031&r1=834030&r2=834031&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java (original)
+++ commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java Mon Nov 9 12:26:52 2009
@@ -927,7 +927,7 @@
type = dynaProperty.getType();
} else if (target instanceof Map) {
type = Object.class;
- } else if (target.getClass().isArray() && index >= 0) {
+ } else if (target != null && target.getClass().isArray() && index >= 0) {
type = Array.get(target, index).getClass();
} else {
PropertyDescriptor descriptor = null;

Added: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira368TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira368TestCase.java?rev=834031&view=auto
==============================================================================
--- commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira368TestCase.java (added)
+++ commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira368TestCase.java Mon Nov 9 12:26:52 2009
@@ -0,0 +1,92 @@
+/*
+ * 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.beanutils.bugs;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.commons.beanutils.BeanUtils;
+
+/**
+ * See https://issues.apache.org/jira/browse/BEANUTILS-368
+ * 
+ *
+ * @version $Revision$ $Date$
+ */
+public class Jira368TestCase extends TestCase {
+
+ /**
+ * Create a test case with the specified name.
+ *
+ * @param name The name of the test
+ */
+ public Jira368TestCase(String name) {
+ super(name);
+ }
+
+ /**
+ * Run the Test.
+ *
+ * @param args Arguments
+ */
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(suite());
+ }
+
+ /**
+ * Create a test suite for this test.
+ *
+ * @return a test suite
+ */
+ public static Test suite() {
+ return (new TestSuite(Jira368TestCase.class));
+ }
+
+ /**
+ * Set up.
+ *
+ * @throws java.lang.Exception
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ /**
+ * Tear Down.
+ *
+ * @throws java.lang.Exception
+ */
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ /**
+ * Test {@link BeanUtils} setProperty() with Null value
+ */
+ public void testBeanUtilsSetProperty_NullBean() throws Exception {
+ try {
+ BeanUtils.setProperty(null, "foo", "bar");
+ } catch (NullPointerException e) {
+ fail("Threw NullPointerException");
+ } catch (IllegalArgumentException e) {
+ // expected result
+ } catch (Exception e) {
+ fail("Threw " + e);
+ }
+ }
+}

Propchange: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira368TestCase.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira368TestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL

Modified: commons/proper/beanutils/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/xdocs/changes.xml?rev=834031&r1=834030&r2=834031&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/xdocs/changes.xml (original)
+++ commons/proper/beanutils/trunk/xdocs/changes.xml Mon Nov 9 12:26:52 2009
@@ -39,6 +39,12 @@
</properties>
<body>

+ <release version="1.8.2" date="2009-11-13" description="Bug fix for 1.8.1">
+ <action dev="niallp" type="fix" issue="BEANUTILS-368" due-to="Peter Fassev">
+ NullPointerException in BeanUtilsBean .setProperty()
+ </action>
+ </release>
+
<release version="1.8.1" date="2009-10-20" description="Bug fixes for 1.8.0">
<action dev="niallp" type="fix" issue="BEANUTILS-300" due-to="Henri and Sebb">
NPE in LazyDynaList

[GUMP@vmgump]: Project commons-jelly-tags-jaxme (in module commons-jelly) success, but with warnings.

2009-11-09T04:24:24Z

To whom it may engage...

This is an automated request, but not an unsolicited one. For
more information please visit http://gump.apache.org/nagged.html,
and/or contact the folk at general@....

Project commons-jelly-tags-jaxme contains errors.
The current state of this project is 'Success'.

Full details are available at:
http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-jaxme/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were provided:
-DEBUG- Sole output [commons-jelly-tags-jaxme-09112009.jar] identifier set to project name
-ERROR- Output with id xmlunit-sumo was not found in project xmlunit
-ERROR- Unhandled Property: maven.jar.xmlunit on: Maven on Project:commons-jelly-tags-jaxme
-DEBUG- Dependency on packaged-jaxme exists, no need to add for property maven.jar.jaxme.
-DEBUG- Dependency on packaged-jaxme exists, no need to add for property maven.jar.jaxme-js.
-DEBUG- Dependency on packaged-jaxme exists, no need to add for property maven.jar.jaxme-xs.
-DEBUG- Dependency on packaged-jaxme exists, no need to add for property maven.jar.jaxme-api.
-DEBUG- Dependency on xml-xerces exists, no need to add for property maven.jar.xerces.
-DEBUG- Dependency on xmlunit exists, no need to add for property maven.jar.xmlunit.
-DEBUG- (Gump generated) Maven Properties in: /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/build.properties
-DEBUG- Maven POM in: /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/project.xml
-DEBUG- Maven project properties in: /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/project.properties
-INFO- No license on redistributable project with outputs.
-INFO- Project Reports in: /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/target/test-reports

The following work was performed:
http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-jaxme/gump_work/build_commons-jelly_commons-jelly-tags-jaxme.html
Work Name: build_commons-jelly_commons-jelly-tags-jaxme (Type: Build)
Work ended in a state of : Success
Elapsed: 3 secs
Command Line: maven --offline jar
[Working Directory: /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme]
CLASSPATH: /usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-09112009.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-jelly/target/commons-jelly-09112009.jar:/srv/gump/public/workspace/commons-jelly/jelly-tags/junit/target/commons-jelly-tags-junit-09112009.jar:/srv/gump/public/workspace/commons-jelly/jelly-tags/xml/target/commons-jelly-tags-xml-09112009.jar:/srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/target/commons-jelly-tags-xmlunit-09112009.jar:/srv/gump/public/workspace/apache-commons/jexl/target/commons-jexl-2.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-09112009.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-09112009.jar:/srv/gump/public/workspace/dom4j/build/dom4j.jar:/srv/gump/public/workspace/jaxen/target/jaxen-09112009.jar:/srv/g
ump/packages/ws-jaxme-0.5/lib/jaxme2-0.5.jar:/srv/gump/packages/ws-jaxme-0.5/lib/jaxmeapi-0.5.jar:/srv/gump/packages/ws-jaxme-0.5/lib/jaxmejs-0.5.jar:/srv/gump/packages/ws-jaxme-0.5/lib/jaxmexs-0.5.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis-ext.jar:/srv/gump/public/workspace/xmlunit/build/java/lib/xmlunit-sumo-09112009.jar
---------------------------------------------
__ __
| \/ |__ _Apache__ ___
| |\/| / _` \ V / -_) ' \ ~ intelligent projects ~
|_| |_\__,_|\_/\___|_||_| v. 1.0.2

You are working offline so the build will continue, but commons-jelly-1.1-SNAPSHOT.jar may be out of date!
build:start:

java:prepare-filesystem:
[mkdir] Created dir: /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/target/classes

java:compile:
[echo] Compiling to /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/target/classes
[javac] Compiling 4 source files to /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/target/classes

java:jar-resources:
Copying 3 files to /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/target/classes

test:prepare-filesystem:
[mkdir] Created dir: /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/target/test-classes
[mkdir] Created dir: /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/target/test-reports

test:test-resources:

test:compile:

test:test:

jar:jar:
[copy] Copying 1 file to /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/target/classes
[copy] Copying 1 file to /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/target/classes
[jar] Building jar: /srv/gump/public/workspace/commons-jelly/jelly-tags/jaxme/target/commons-jelly-tags-jaxme-09112009.jar
BUILD SUCCESSFUL
Total time: 3 seconds
Finished at: Mon Nov 09 04:24:21 PST 2009

---------------------------------------------

To subscribe to this information via syndicated feeds:
- RSS: http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-jaxme/rss.xml
- Atom: http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-jaxme/atom.xml

============================== Gump Tracking Only ===
Produced by Gump version 2.3.
Gump Run 06000009112009, vmgump:vmgump-public:06000009112009
Gump E-mail Identifier (unique within run) #49.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

[GUMP@vmgump]: Project commons-jelly-tags-xmlunit (in module commons-jelly) success, but with warnings.

2009-11-09T04:11:43Z

To whom it may engage...

This is an automated request, but not an unsolicited one. For
more information please visit http://gump.apache.org/nagged.html,
and/or contact the folk at general@....

Project commons-jelly-tags-xmlunit contains errors.
The current state of this project is 'Success'.

Full details are available at:
http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-xmlunit/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were provided:
-DEBUG- Sole output [commons-jelly-tags-xmlunit-09112009.jar] identifier set to project name
-ERROR- Output with id xmlunit-sumo was not found in project xmlunit
-ERROR- Unhandled Property: maven.jar.xmlunit on: Maven on Project:commons-jelly-tags-xmlunit
-DEBUG- Dependency on xml-xerces exists, no need to add for property maven.jar.xerces.
-DEBUG- Dependency on xmlunit exists, no need to add for property maven.jar.xmlunit.
-DEBUG- (Gump generated) Maven Properties in: /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/build.properties
-DEBUG- Maven POM in: /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/project.xml
-DEBUG- Maven project properties in: /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/project.properties
-INFO- No license on redistributable project with outputs.
-INFO- Project Reports in: /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/target/test-reports

The following work was performed:
http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-xmlunit/gump_work/build_commons-jelly_commons-jelly-tags-xmlunit.html
Work Name: build_commons-jelly_commons-jelly-tags-xmlunit (Type: Build)
Work ended in a state of : Success
Elapsed: 3 secs
Command Line: maven --offline jar
[Working Directory: /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit]
CLASSPATH: /usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-09112009.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-jelly/target/commons-jelly-09112009.jar:/srv/gump/public/workspace/commons-jelly/jelly-tags/junit/target/commons-jelly-tags-junit-09112009.jar:/srv/gump/public/workspace/commons-jelly/jelly-tags/xml/target/commons-jelly-tags-xml-09112009.jar:/srv/gump/public/workspace/apache-commons/jexl/target/commons-jexl-2.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-09112009.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-09112009.jar:/srv/gump/public/workspace/dom4j/build/dom4j.jar:/srv/gump/public/workspace/jaxen/target/jaxen-09112009.jar:/srv/gump/public/workspace/junit/dist/junit-09112009.jar:/srv/gump/public/workspace/xml-commons/java/external/bui
ld/xml-apis-ext.jar:/srv/gump/public/workspace/xmlunit/build/java/lib/xmlunit-sumo-09112009.jar
---------------------------------------------
__ __
| \/ |__ _Apache__ ___
| |\/| / _` \ V / -_) ' \ ~ intelligent projects ~
|_| |_\__,_|\_/\___|_||_| v. 1.0.2

You are working offline so the build will continue, but commons-jelly-1.1-SNAPSHOT.jar may be out of date!
build:start:

java:prepare-filesystem:
[mkdir] Created dir: /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/target/classes

java:compile:
[echo] Compiling to /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/target/classes
[javac] Compiling 5 source files to /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/target/classes

java:jar-resources:

test:prepare-filesystem:
[mkdir] Created dir: /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/target/test-classes
[mkdir] Created dir: /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/target/test-reports

test:test-resources:

test:compile:

test:test:

jar:jar:
[copy] Copying 1 file to /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/target/classes
[copy] Copying 1 file to /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/target/classes
[jar] Building jar: /srv/gump/public/workspace/commons-jelly/jelly-tags/xmlunit/target/commons-jelly-tags-xmlunit-09112009.jar
BUILD SUCCESSFUL
Total time: 3 seconds
Finished at: Mon Nov 09 04:11:42 PST 2009

---------------------------------------------

To subscribe to this information via syndicated feeds:
- RSS: http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-xmlunit/rss.xml
- Atom: http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-xmlunit/atom.xml

============================== Gump Tracking Only ===
Produced by Gump version 2.3.
Gump Run 06000009112009, vmgump:vmgump-public:06000009112009
Gump E-mail Identifier (unique within run) #45.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

[GUMP@vmgump]: Project commons-configuration-test (in module apache-commons) failed

2009-11-09T03:43:28Z

To whom it may engage...

This is an automated request, but not an unsolicited one. For
more information please visit http://gump.apache.org/nagged.html,
and/or contact the folk at general@....

Project commons-configuration-test has an issue affecting its community integration.
This issue affects 1 projects,
and has been outstanding for 106 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- commons-configuration-test : Apache Commons

Full details are available at:
http://vmgump.apache.org/gump/public/apache-commons/commons-configuration-test/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were provided:
-WARNING- Overriding Maven2 settings: [/srv/gump/public/workspace/apache-commons/configuration/gump_mvn_settings.xml]
-DEBUG- (Gump generated) Maven2 Settings in: /srv/gump/public/workspace/apache-commons/configuration/gump_mvn_settings.xml
-INFO- Failed with reason build failed
-DEBUG- Maven POM in: /srv/gump/public/workspace/apache-commons/configuration/pom.xml
-INFO- Project Reports in: /srv/gump/public/workspace/apache-commons/configuration/target/surefire-reports

The following work was performed:
http://vmgump.apache.org/gump/public/apache-commons/commons-configuration-test/gump_work/build_apache-commons_commons-configuration-test.html
Work Name: build_apache-commons_commons-configuration-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 5 mins 53 secs
Command Line: mvn --batch-mode --settings /srv/gump/public/workspace/apache-commons/configuration/gump_mvn_settings.xml test
[Working Directory: /srv/gump/public/workspace/apache-commons/configuration]
CLASSPATH: /usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/apache-commons/configuration/target/commons-configuration-1.7-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/jexl/target/commons-jexl-2.0-SNAPSHOT.jar
---------------------------------------------
testInitCopy(org.apache.commons.configuration.TestXMLConfiguration)
testSaveWithDelimiterParsingDisabled(org.apache.commons.configuration.TestXMLConfiguration)
testSetRootAttribute(org.apache.commons.configuration.TestXMLConfiguration)
testLoadAndSaveFromFile(org.apache.commons.configuration.TestXMLConfiguration)
testSaveToURL(org.apache.commons.configuration.TestXMLConfiguration)
testSaveToStream(org.apache.commons.configuration.TestXMLConfiguration)
testAutoSave(org.apache.commons.configuration.TestXMLConfiguration)
testSaveAttributes(org.apache.commons.configuration.TestXMLConfiguration)
testCloneWithSave(org.apache.commons.configuration.TestXMLConfiguration)
testEmptyElements(org.apache.commons.configuration.TestXMLConfiguration)
testSaveWithEncoding(org.apache.commons.configuration.TestXMLConfiguration)
testSaveWithNullEncoding(org.apache.commons.configuration.TestXMLConfiguration)
testSaveWithDoctype(org.apache.commons.configuration.TestXMLConfiguration)
testSaveWithDoctypeIDs(org.apache.commons.configuration.TestXMLConfiguration)
testSubsetWithReload(org.apache.commons.configuration.TestXMLConfiguration)
testConfigurationAtWithReload(org.apache.commons.configuration.TestXMLConfiguration)
testConfigurationsAtWithReload(org.apache.commons.configuration.TestXMLConfiguration)
testGetKeysWithReload(org.apache.commons.configuration.TestXMLConfiguration)
testSetTextRootElement(org.apache.commons.configuration.TestXMLConfiguration)
testClearTextRootElement(org.apache.commons.configuration.TestXMLConfiguration)
testAutoSaveWithSubnodeConfig(org.apache.commons.configuration.TestXMLConfiguration)
testAutoSaveWithSubSubnodeConfig(org.apache.commons.configuration.TestXMLConfiguration)
testSaveDelimiterParsingDisabled(org.apache.commons.configuration.TestXMLConfiguration)
testSaveDelimiterParsingDisabledAttrs(org.apache.commons.configuration.TestXMLConfiguration)
testMultipleAttrValuesEscaped(org.apache.commons.configuration.TestXMLConfiguration)
testAutoSaveWithReloadingStrategy(org.apache.commons.configuration.TestXMLConfiguration)
testAutoSaveAddNodes(org.apache.commons.configuration.TestXMLConfiguration)
testAddNodesAndSave(org.apache.commons.configuration.TestXMLConfiguration)
testRegisterEntityId(org.apache.commons.configuration.TestXMLConfiguration)
testSaveAfterCreateWithCopyConstructor(org.apache.commons.configuration.TestXMLConfiguration)
testCopyRootName(org.apache.commons.configuration.TestXMLConfiguration)
testCopyRootNameNoDocument(org.apache.commons.configuration.TestXMLConfiguration)
testSaveWithValidation(org.apache.commons.configuration.TestXMLConfiguration)
testSaveWithValidationFailure(org.apache.commons.configuration.TestXMLConfiguration)

Tests run: 1456, Failures: 0, Errors: 58, Skipped: 0

[INFO] ------------------------------------------------------------------------
[ERROR] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] There are test failures.

Please refer to /srv/gump/public/workspace/apache-commons/configuration/target/surefire-reports for the individual test results.
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 5 minutes 53 seconds
[INFO] Finished at: Mon Nov 09 03:43:24 PST 2009
[INFO] Final Memory: 17M/30M
[INFO] ------------------------------------------------------------------------
---------------------------------------------

To subscribe to this information via syndicated feeds:
- RSS: http://vmgump.apache.org/gump/public/apache-commons/commons-configuration-test/rss.xml
- Atom: http://vmgump.apache.org/gump/public/apache-commons/commons-configuration-test/atom.xml

============================== Gump Tracking Only ===
Produced by Gump version 2.3.
Gump Run 06000009112009, vmgump:vmgump-public:06000009112009
Gump E-mail Identifier (unique within run) #42.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [VOTE] Release of DbUtils 1.3 RC4

2009-11-09T02:15:36Z

+1

On Mon, Nov 9, 2009 at 6:12 AM, Julien Aymé <julien.ayme@...> wrote:

> +1
>
> Julien
>
> 2009/11/8 Dan Fabulich <dan@...>:
> >
> > This release includes support for Java5 generics and varargs.
> >
> > In RC3 I accidentally added a dependency on Java 1.6 while fixing
> FindBugs
> > errors; in RC4 I fixed that bug.
> >
> > As noted in earlier RCs, I believe 1.3 to be a backwards compatible
> binary,
> > but I'm still only 99% sure of this; clirr reports a bunch of
> compatibility
> > errors that look like nonsense. I did run the compiled 1.2 tests against
> 1.3
> > and it looks OK.
> >
> > +1 from me!
> >
> > --
> >
> > Tag:
> >
> >
> https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/
> >
> > Site:
> >
> > http://people.apache.org/builds/commons/dbutils/1.3/RC4/site/index.html
> >
> > Binaries:
> >
> >
> http://people.apache.org/builds/commons/dbutils/1.3/RC4/staged/commons-dbutils/commons-dbutils/1.3/
> >
> > [ ] +1 release it
> > [ ] +0 go ahead I don't care
> > [ ] -1 no, do not release it because
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@...
> > For additional commands, e-mail: dev-help@...
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@...
> > For additional commands, e-mail: dev-help@...
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@...
> > For additional commands, e-mail: dev-help@...
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

Re: [vfs] JDK 1.5

2009-11-08T23:34:08Z

On Nov 8, 2009, at 10:24 PM, Jörg Schaible wrote:

> Guys,
>
> looking at Ralph's comment in https://issues.apache.org/jira/browse/VFS-254
> I am questionning myself, if there's any reason why vfs 2.0 should
> still
> have JDK 1.4 as requirement and not JDK 1.5. VFS 2.0 will be a major
> release and JDK 1.7 is years away to be used for our conservative
> customers. Although we have still some maintenance support for JDK
> 1.4-based apps, they're phasing out and we will definitely not update
> dependencies with major releases. Therefore I'd rather have a VFS
> with more
> modern API (generics) in 2.0 than an "old-fashioned" version 2.0
> based on
> JDK 1.4 especially if the major release means that API changes too
> much for
> a drop in replacement of 1.1. Thoughts ?
>

Actually, there was a poll on the dev list in august and no one
objected to moving to JDK 5. I have no problem with changing the
compile and target versions to Java 5 but I would really like to see
2.0 released asap. I'm already using it in production and from
comments I've seen I'm pretty sure others are as well. At this point I
think it would be good to keep the changes on 2.0 to a minimum

I made changes on the VFS281 branch that require Java 5 as the minimum
version internally but doesn't break compatibility in any other way. I
haven't merged that to trunk because I asked for feedback and got
none. At this point I'm prepared to go out with 2.0 without this and
then consider adding it to whatever the next release is going to be.

To me, the primary concern is getting 2.0 released and there are still
a ton of Jira issues, many with patches, that I haven't had a chance
to look at. I took a stab at applying some easy ones over the last few
days, but there are some that deal with issues findbugs found that
probably should be addressed.

Ralph
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

RE: [vfs] JDK 1.5

2009-11-08T23:09:41Z

> -----Original Message-----
> From: news [mailto:news@...] On Behalf Of Jörg Schaible
> Sent: Sunday, November 08, 2009 22:24
> To: dev@...
> Subject: [vfs] JDK 1.5
>
> Guys,
>
> looking at Ralph's comment in
> https://issues.apache.org/jira/browse/VFS-254
> I am questionning myself, if there's any reason why vfs 2.0 should
> still
> have JDK 1.4 as requirement and not JDK 1.5. VFS 2.0 will be a major
> release and JDK 1.7 is years away to be used for our conservative
> customers. Although we have still some maintenance support for JDK
> 1.4-based apps, they're phasing out and we will definitely not update
> dependencies with major releases. Therefore I'd rather have a VFS with
> more
> modern API (generics) in 2.0 than an "old-fashioned" version 2.0 based
> on
> JDK 1.4 especially if the major release means that API changes too much
> for
> a drop in replacement of 1.1. Thoughts ?

Yes, good idea, drop Java 1.4 in favor of at least 1.5.

Gary

>
> - Jörg
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...

RE: [vfs] JDK 1.5

2009-11-08T22:43:31Z

Hi!

> looking at Ralph's comment in
> https://issues.apache.org/jira/browse/VFS-254
> I am questionning myself, if there's any reason why vfs 2.0 should
> still
> have JDK 1.4 as requirement and not JDK 1.5.

If it is just me, I'd be happy to drop 1.4 dependency - Past votes were declined. Probably the time is ripe now.

If it is worth to generify the API is another story - as Ralph pointed out, the next logical step for VFS is to support the upcomming JDK 1.7 file.spi stuff. That is also my view, and hopefully falls into times where I have more time left to spend for VFS again.
Having a complete new api I see no point putting efforts into generifying the current api.
If we discover that the JDK 1.7 api is too limiting thigs might change, though.

On the other hand, as the VFS api is today, generifying it might be a "no-brainer" ;-)
We event might manage to generify without changed the VFS api - keeping it backward compatible.

Ciao,
Mario

[vfs] JDK 1.5

2009-11-08T22:24:22Z

Guys,

looking at Ralph's comment in https://issues.apache.org/jira/browse/VFS-254
I am questionning myself, if there's any reason why vfs 2.0 should still
have JDK 1.4 as requirement and not JDK 1.5. VFS 2.0 will be a major
release and JDK 1.7 is years away to be used for our conservative
customers. Although we have still some maintenance support for JDK
1.4-based apps, they're phasing out and we will definitely not update
dependencies with major releases. Therefore I'd rather have a VFS with more
modern API (generics) in 2.0 than an "old-fashioned" version 2.0 based on
JDK 1.4 especially if the major release means that API changes too much for
a drop in replacement of 1.1. Thoughts ?

- Jörg

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [VOTE] Release of DbUtils 1.3 RC4

2009-11-08T21:12:25Z

+1

Julien

2009/11/8 Dan Fabulich <dan@...>:

>
> This release includes support for Java5 generics and varargs.
>
> In RC3 I accidentally added a dependency on Java 1.6 while fixing FindBugs
> errors; in RC4 I fixed that bug.
>
> As noted in earlier RCs, I believe 1.3 to be a backwards compatible binary,
> but I'm still only 99% sure of this; clirr reports a bunch of compatibility
> errors that look like nonsense. I did run the compiled 1.2 tests against 1.3
> and it looks OK.
>
> +1 from me!
>
> --
>
> Tag:
>
> https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/
>
> Site:
>
> http://people.apache.org/builds/commons/dbutils/1.3/RC4/site/index.html
>
> Binaries:
>
> http://people.apache.org/builds/commons/dbutils/1.3/RC4/staged/commons-dbutils/commons-dbutils/1.3/
>
> [ ] +1 release it
> [ ] +0 go ahead I don't care
> [ ] -1 no, do not release it because
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r833944 - /commons/proper/net/tags/NET_2_1_RC_3/

2009-11-08T15:20:14Z

Author: rwinston
Date: Sun Nov 8 23:20:14 2009
New Revision: 833944

URL: http://svn.apache.org/viewvc?rev=833944&view=rev
Log:
Just create a new copy

Added:
commons/proper/net/tags/NET_2_1_RC_3/
- copied from r833943, commons/proper/net/branches/NET_2_0/