svn commit: r648647 - /commons/sandbox/nabla/trunk/NOTICE.txt
Author: luc Date: Wed Apr 16 02:39:10 2008 New Revision: 648647 URL: http://svn.apache.org/viewvc?rev=648647&view=rev Log: added reference to the ASM license note that Nabla does not include any code from ASM, it simply uses it. Modified: commons/sandbox/nabla/trunk/NOTICE.txt Modified: commons/sandbox/nabla/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/NOTICE.txt?rev=648647&r1=648646&r2=648647&view=diff == --- commons/sandbox/nabla/trunk/NOTICE.txt (original) +++ commons/sandbox/nabla/trunk/NOTICE.txt Wed Apr 16 02:39:10 2008 @@ -3,3 +3,8 @@ This product includes software developed by The Apache Software Foundation (http://www.apache.org/). + +This products depends on (but does not include) the +ASM library developed by INRIA and France Telecom. +ASM is available under a 3-clauses BSD license +(http://asm.objectweb.org/license.html)
svn commit: r648818 - /commons/sandbox/nabla/trunk/NOTICE.txt
Author: luc Date: Wed Apr 16 12:49:14 2008 New Revision: 648818 URL: http://svn.apache.org/viewvc?rev=648818&view=rev Log: removing ASM stuff as it is not distributed with the code (see http://markmail.org/message/m4dj6ygbg6bymb67) Modified: commons/sandbox/nabla/trunk/NOTICE.txt Modified: commons/sandbox/nabla/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/NOTICE.txt?rev=648818&r1=648817&r2=648818&view=diff == --- commons/sandbox/nabla/trunk/NOTICE.txt (original) +++ commons/sandbox/nabla/trunk/NOTICE.txt Wed Apr 16 12:49:14 2008 @@ -3,8 +3,3 @@ This product includes software developed by The Apache Software Foundation (http://www.apache.org/). - -This products depends on (but does not include) the -ASM library developed by INRIA and France Telecom. -ASM is available under a 3-clauses BSD license -(http://asm.objectweb.org/license.html)
svn commit: r648880 - /commons/proper/io/trunk/pom.xml
Author: niallp Date: Wed Apr 16 15:22:49 2008 New Revision: 648880 URL: http://svn.apache.org/viewvc?rev=648880&view=rev Log: Upgrade to new 2.0 version of maven-changes-plugin Modified: commons/proper/io/trunk/pom.xml Modified: commons/proper/io/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/pom.xml?rev=648880&r1=648879&r2=648880&view=diff == --- commons/proper/io/trunk/pom.xml (original) +++ commons/proper/io/trunk/pom.xml Wed Apr 16 15:22:49 2008 @@ -260,18 +260,13 @@ org.apache.maven.plugins maven-changes-plugin -2.0-beta-3 +2.0 %URL%/../%ISSUE% - - &&resolution=1&fixfor=12312101 + Fix Version,Type,Key,Summary,Priority,Reporter,Resolution + Fix Version DESC,Type,Key DESC + Fixed + Resolved,Closed
svn commit: r648891 - /commons/proper/commons-sandbox-parent/trunk/pom.xml
Author: niallp Date: Wed Apr 16 15:45:21 2008 New Revision: 648891 URL: http://svn.apache.org/viewvc?rev=648891&view=rev Log: Upgrade to version 2.2 of taglist-maven-plugin (fixes MTAGLIST-31) Modified: commons/proper/commons-sandbox-parent/trunk/pom.xml Modified: commons/proper/commons-sandbox-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-sandbox-parent/trunk/pom.xml?rev=648891&r1=648890&r2=648891&view=diff == --- commons/proper/commons-sandbox-parent/trunk/pom.xml (original) +++ commons/proper/commons-sandbox-parent/trunk/pom.xml Wed Apr 16 15:45:21 2008 @@ -53,14 +53,10 @@ cobertura-maven-plugin 2.2 - - -
svn commit: r648903 - /commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java
Author: niallp
Date: Wed Apr 16 17:16:53 2008
New Revision: 648903
URL: http://svn.apache.org/viewvc?rev=648903&view=rev
Log:
Provide more info for tests failing in Continuum
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java?rev=648903&r1=648902&r2=648903&view=diff
==
---
commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java
Wed Apr 16 17:16:53 2008
@@ -414,6 +414,12 @@
* Check all the Collections have the expected sizes.
*/
private void checkCollectionSizes(String label, int dirCreate, int
dirChange, int dirDelete, int fileCreate, int fileChange, int fileDelete) {
+label = label + "[" + listener.getCreatedDirectories().size() +
+" " + listener.getChangedDirectories().size() +
+" " + listener.getDeletedDirectories().size() +
+" " + listener.getCreatedFiles().size() +
+" " + listener.getChangedFiles().size() +
+" " + listener.getDeletedFiles().size() + "]";
assertEquals(label + ": No. of directories created", dirCreate,
listener.getCreatedDirectories().size());
assertEquals(label + ": No. of directories changed", dirChange,
listener.getChangedDirectories().size());
assertEquals(label + ": No. of directories deleted", dirDelete,
listener.getDeletedDirectories().size());
svn commit: r648905 - /commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java
Author: niallp
Date: Wed Apr 16 17:29:19 2008
New Revision: 648905
URL: http://svn.apache.org/viewvc?rev=648905&view=rev
Log:
Increase delay to see if that affects continuum
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java?rev=648905&r1=648904&r2=648905&view=diff
==
---
commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/monitor/FilesystemObserverTestCase.java
Wed Apr 16 17:29:19 2008
@@ -441,7 +441,7 @@
FileUtils.touch(file);
while (lastModified == file.lastModified()) {
try {
-Thread.sleep(5);
+Thread.sleep(50);
} catch(InterruptedException ie) {
// ignore
}
svn commit: r648966 - in /commons/proper/configuration/branches/configuration2_experimental/src: main/java/org/apache/commons/configuration2/combined/ main/java/org/apache/commons/configuration2/expr/
Author: oheger
Date: Wed Apr 16 23:18:23 2008
New Revision: 648966
URL: http://svn.apache.org/viewvc?rev=648966&view=rev
Log:
Extended NodeHandler interface to distinguish between value and structure nodes
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/CombinedConfigurationNodeHandler.java
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/AbstractNodeHandler.java
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/NodeHandler.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/combined/TestCombinedConfigurationNodeHandler.java
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/CombinedConfigurationNodeHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/CombinedConfigurationNodeHandler.java?rev=648966&r1=648965&r2=648966&view=diff
==
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/CombinedConfigurationNodeHandler.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/CombinedConfigurationNodeHandler.java
Wed Apr 16 23:18:23 2008
@@ -142,6 +142,20 @@
}
/**
+ * Adds a new child with a value to a parent node. This implementation
+ * delegates to the node handler responsible for the passed in node.
+ *
+ * @param node the node
+ * @param name the name of the new child node
+ * @param value the value
+ * @return the newly created child node
+ */
+public Object addChild(Object node, String name, Object value)
+{
+return fetchHandler(node).addChild(node, name, value);
+}
+
+/**
* Returns the value of the specified attribute of the given node. This
* implementation delegates to the node handler responsible for the passed
* in node.
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/AbstractNodeHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/AbstractNodeHandler.java?rev=648966&r1=648965&r2=648966&view=diff
==
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/AbstractNodeHandler.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/AbstractNodeHandler.java
Wed Apr 16 23:18:23 2008
@@ -71,4 +71,21 @@
{
return getValue(node) != null || hasAttributes(node);
}
+
+/**
+ * Adds a child node with a value. This implementation delegates to the
+ * overloaded addChild() method and then sets the value on
+ * the resulting node.
+ *
+ * @param node the parent node
+ * @param name the name of the new child
+ * @param value the value
+ * @return the newly created child node
+ */
+public T addChild(T node, String name, Object value)
+{
+T child = addChild(node, name);
+setValue(child, value);
+return child;
+}
}
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/NodeHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/NodeHandler.java?rev=648966&r1=648965&r2=648966&view=diff
==
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/NodeHandler.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/NodeHandler.java
Wed Apr 16 23:18:23 2008
@@ -80,6 +80,22 @@
T addChild(T node, String name);
/**
+ * Adds a child with the given node name and value to the specified parent
+ * node. This method is used for creating nodes with a value while the
other
+ * addChild() method creates structure nodes (i.e. nodes that
+ * may contain child nodes and attributes, but do not have a value). Some
+ * concrete implementations of node handler have
svn commit: r648969 - /commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
Author: oheger
Date: Wed Apr 16 23:26:54 2008
New Revision: 648969
URL: http://svn.apache.org/viewvc?rev=648969&view=rev
Log:
Distinguish between value and structure nodes when invoking the node handler
for creating new nodes
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java?rev=648969&r1=648968&r2=648969&view=diff
==
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
Wed Apr 16 23:26:54 2008
@@ -711,6 +711,21 @@
}
/**
+ * Creates a new node object with the specified name and value. This base
+ * implementation delegates to the NodeHandler for creating a
+ * new node.
+ *
+ * @param parent the parent of the new node
+ * @param name the name of the new node
+ * @param value the value of the new node
+ * @return the new node
+ */
+protected T createNode(T parent, String name, Object value)
+{
+return getNodeHandler().addChild(parent, name, value);
+}
+
+/**
* Helper method for processing a NodeAddData object obtained
from the
* expression engine. This method will create all new nodes and set the
value
* of the last node, which represents the newly added property.
@@ -757,8 +772,7 @@
}
else
{
-T child = createNode(parent, name);
-getNodeHandler().setValue(child, value);
+T child = createNode(parent, name, value);
return child;
}
}
svn commit: r648976 - in /commons/proper/configuration/branches/configuration2_experimental/src: main/java/org/apache/commons/configuration2/PreferencesConfiguration.java test/java/org/apache/commons/
Author: oheger
Date: Wed Apr 16 23:40:56 2008
New Revision: 648976
URL: http://svn.apache.org/viewvc?rev=648976&view=rev
Log:
Initial implementation of PreferencesConfiguration
Added:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PreferencesConfiguration.java
(with props)
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPreferencesConfiguration.java
(with props)
Added:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PreferencesConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PreferencesConfiguration.java?rev=648976&view=auto
==
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PreferencesConfiguration.java
(added)
+++
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/PreferencesConfiguration.java
Wed Apr 16 23:40:56 2008
@@ -0,0 +1,425 @@
+/*
+ * 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.configuration2;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.prefs.BackingStoreException;
+import java.util.prefs.Preferences;
+
+import org.apache.commons.configuration2.expr.AbstractNodeHandler;
+import org.apache.commons.configuration2.expr.ExpressionEngine;
+import org.apache.commons.configuration2.expr.def.DefaultExpressionEngine;
+
+/**
+ *
+ * A configuration implementation on top of the Java Preferences
+ * API.
+ *
+ *
+ * This implementation of the Configuration interface is backed
+ * by a java.util.prefs.Preferences node. Query or update
+ * operations are directly performed on this node and its descendants. When
+ * creating this configuration the underlying Preferences node
+ * can be determined:
+ *
+ * the system root node
+ * the user root node
+ * a system node corresponding to a specific package
+ * a user node corresponding to a specific package
+ *
+ * This corresponds to the static factory methods provided by the
+ * Preferences class. It is also possible to change this node
+ * later by calling setAssociatedClass() or
+ * setSystem().
+ *
+ *
+ * With this class the power provided by the Configuration
+ * interface can be used for interacting with Preferences nodes.
+ * Note however that some features provided by the Configuration
+ * interface are not supported by the Preferences API. One
+ * example of such a feature is the support for multiple values for a property.
+ *
+ *
+ * @author Oliver Heger
+ * @version $Id$
+ */
+public class PreferencesConfiguration extends
+AbstractHierarchicalConfiguration
+{
+/** A lock for protecting the root node. */
+private Lock lockRoot;
+
+/** Stores the associated preferences node. */
+private Preferences root;
+
+/** Stores the class to be used when obtaining the root node. */
+private Class associatedClass;
+
+/** Stores the system flag. */
+private boolean system;
+
+/**
+ * Creates a new instance of PreferencesConfiguration that
+ * accesses the user root node.
+ */
+public PreferencesConfiguration()
+{
+this(false, null);
+}
+
+/**
+ * Creates a new instance of PreferencesConfiguration that
+ * accesses either the system or the user root node.
+ *
+ * @param system true for the system root node, false for
+ *the user root node
+ */
+public PreferencesConfiguration(boolean system)
+{
+this(system, null);
+}
+
+/**
+ * Creates a new instance of PreferencesConfiguration that
+ * accesses the user preferences node associated with the package of the
+ * specified class.
+ *
+ * @param c the class definin
