svn commit: r833896 - in /commons/proper/configuration/trunk/src: java/org/apache/commons/configuration/interpol/EnvironmentLookup.java test/org/apache/commons/configuration/interpol/TestEnvironmentLo
Author: oheger
Date: Sun Nov 8 17:38:19 2009
New Revision: 833896
URL: http://svn.apache.org/viewvc?rev=833896view=rev
Log:
[CONFIGURATION-399] Added EnvironmentLookup class.
Added:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/EnvironmentLookup.java
(with props)
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/interpol/TestEnvironmentLookup.java
(with props)
Added:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/EnvironmentLookup.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/EnvironmentLookup.java?rev=833896view=auto
==
---
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/EnvironmentLookup.java
(added)
+++
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/EnvironmentLookup.java
Sun Nov 8 17:38:19 2009
@@ -0,0 +1,64 @@
+/*
+ * 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.configuration.interpol;
+
+import org.apache.commons.configuration.EnvironmentConfiguration;
+import org.apache.commons.lang.text.StrLookup;
+
+/**
+ * p
+ * A specialized lookup implementation that allows access to environment
+ * variables.
+ * /p
+ * p
+ * This implementation relies on {...@link EnvironmentConfiguration} to resolve
+ * environment variables. It can be used for referencing environment variables
+ * in configuration files in an easy way, for instance:
+ *
+ * pre
+ * java.home = ${env:JAVA_HOME}
+ * /pre
+ *
+ * /p
+ * p
+ * codeEnvironmentLookup/code is one of the standard lookups that is
+ * registered per default for each configuration.
+ * /p
+ *
+ * @author a
+ *
href=http://commons.apache.org/configuration/team-list.html;Commons
+ * Configuration team/a
+ * @since 1.7
+ * @version $Id$
+ */
+public class EnvironmentLookup extends StrLookup
+{
+/** Stores the underlying codeEnvironmentConfiguration/code. */
+private final EnvironmentConfiguration environmentConfig = new
EnvironmentConfiguration();
+
+/**
+ * Performs a lookup for the specified variable. This implementation
+ * directly delegates to a codeEnvironmentConfiguration/code.
+ *
+ * @param key the key to lookup
+ * @return the value of this key or bnull/b if it cannot be resolved
+ */
+public String lookup(String key)
+{
+return environmentConfig.getString(key);
+}
+}
Propchange:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/EnvironmentLookup.java
--
svn:eol-style = native
Propchange:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/EnvironmentLookup.java
--
svn:keywords = Date Author Id Revision HeadURL
Propchange:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/EnvironmentLookup.java
--
svn:mime-type = text/plain
Added:
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/interpol/TestEnvironmentLookup.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/interpol/TestEnvironmentLookup.java?rev=833896view=auto
==
---
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/interpol/TestEnvironmentLookup.java
(added)
+++
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/interpol/TestEnvironmentLookup.java
Sun Nov 8 17:38:19 2009
@@ -0,0 +1,66 @@
+/*
+ * 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
svn commit: r833898 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Author: dfabulich
Date: Sun Nov 8 17:59:20 2009
New Revision: 833898
URL: http://svn.apache.org/viewvc?rev=833898view=rev
Log:
Fixing 1.5 compatibility error
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java?rev=833898r1=833897r2=833898view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Sun Nov 8 17:59:20 2009
@@ -29,7 +29,6 @@
import java.sql.ResultSet;
import java.sql.Time;
import java.sql.Timestamp;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -213,7 +212,10 @@
* @return the value
*/
public byte[] getNullBytes() {
-return this.nullBytes == null ? null : Arrays.copyOf(this.nullBytes,
this.nullBytes.length);
+if (this.nullBytes == null) return null;
+byte[] copy = new byte[this.nullBytes.length];
+System.arraycopy(this.nullBytes, 0, copy, 0, this.nullBytes.length);
+return copy;
}
/**
@@ -449,7 +451,9 @@
* @param nullBytes the value
*/
public void setNullBytes(byte[] nullBytes) {
-this.nullBytes = Arrays.copyOf(nullBytes, nullBytes.length);
+byte[] copy = new byte[nullBytes.length];
+System.arraycopy(nullBytes, 0, copy, 0, nullBytes.length);
+this.nullBytes = copy;
}
/**
svn commit: r833899 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Nov 8 17:59:58 2009 New Revision: 833899 URL: http://svn.apache.org/viewvc?rev=833899view=rev Log: Prepare for RC4 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=833899r1=833898r2=833899view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Nov 8 17:59:58 2009 @@ -183,7 +183,7 @@ maven.compile.target1.5/maven.compile.target commons.componentiddbutils/commons.componentid commons.release.version1.3/commons.release.version -commons.rc.versionRC3/commons.rc.version +commons.rc.versionRC4/commons.rc.version commons.binary.suffix / commons.jira.idDBUTILS/commons.jira.id commons.jira.pid12310470/commons.jira.pid
svn commit: r833902 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Nov 8 18:02:55 2009 New Revision: 833902 URL: http://svn.apache.org/viewvc?rev=833902view=rev Log: [maven-release-plugin] prepare release DBUTILS_1_3_RC4 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=833902r1=833901r2=833902view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Nov 8 18:02:55 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.4-SNAPSHOT/version + version1.3/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/developerConnection + urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/url /scm developers
svn commit: r833903 - /commons/proper/dbutils/tags/DBUTILS_1_3_RC4/
Author: dfabulich Date: Sun Nov 8 18:02:59 2009 New Revision: 833903 URL: http://svn.apache.org/viewvc?rev=833903view=rev Log: [maven-scm] copy for tag DBUTILS_1_3_RC4 Added: commons/proper/dbutils/tags/DBUTILS_1_3_RC4/ (props changed) - copied from r833902, commons/proper/dbutils/trunk/ Propchange: commons/proper/dbutils/tags/DBUTILS_1_3_RC4/ -- --- svn:ignore (added) +++ svn:ignore Sun Nov 8 18:02:59 2009 @@ -0,0 +1,5 @@ +target +maven.log +.classpath +.project +*.log Propchange: commons/proper/dbutils/tags/DBUTILS_1_3_RC4/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Nov 8 18:02:59 2009 @@ -0,0 +1,2 @@ +/commons/sandbox/dbutils/bugfixing:741987-747450 +/commons/sandbox/dbutils/java5:741988-832184
svn commit: r833904 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Sun Nov 8 18:03:01 2009 New Revision: 833904 URL: http://svn.apache.org/viewvc?rev=833904view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=833904r1=833903r2=833904view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Sun Nov 8 18:03:01 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.3/version + version1.4-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/developerConnection - urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_3_RC4/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url /scm developers
svn commit: r833912 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Author: dfabulich
Date: Sun Nov 8 18:59:55 2009
New Revision: 833912
URL: http://svn.apache.org/viewvc?rev=833912view=rev
Log:
Fix minor CheckStyle error
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java?rev=833912r1=833911r2=833912view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSet.java
Sun Nov 8 18:59:55 2009
@@ -212,7 +212,9 @@
* @return the value
*/
public byte[] getNullBytes() {
-if (this.nullBytes == null) return null;
+if (this.nullBytes == null) {
+return null;
+}
byte[] copy = new byte[this.nullBytes.length];
System.arraycopy(this.nullBytes, 0, copy, 0, this.nullBytes.length);
return copy;
svn commit: r833923 - in /commons/proper/configuration/trunk/src: java/org/apache/commons/configuration/interpol/ConfigurationInterpolator.java test/org/apache/commons/configuration/TestAbstractConfig
Author: oheger
Date: Sun Nov 8 20:53:52 2009
New Revision: 833923
URL: http://svn.apache.org/viewvc?rev=833923view=rev
Log:
[CONFIGURATION-399] Integrated EnvironmentLookup into the default interpolation
mechanism.
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/ConfigurationInterpolator.java
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/ConfigurationInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/ConfigurationInterpolator.java?rev=833923r1=833922r2=833923view=diff
==
---
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/ConfigurationInterpolator.java
(original)
+++
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/interpol/ConfigurationInterpolator.java
Sun Nov 8 20:53:52 2009
@@ -116,6 +116,13 @@
*/
public static final String PREFIX_CONSTANTS = const;
+/**
+ * Constant for the prefix of the standard lookup object for resolving
+ * environment properties.
+ * @since 1.7
+ */
+public static final String PREFIX_ENVIRONMENT = env;
+
/** Constant for the prefix separator. */
private static final char PREFIX_SEPARATOR = ':';
@@ -376,5 +383,6 @@
globalLookups = new HashMap();
globalLookups.put(PREFIX_SYSPROPERTIES,
StrLookup.systemPropertiesLookup());
globalLookups.put(PREFIX_CONSTANTS, new ConstantLookup());
+globalLookups.put(PREFIX_ENVIRONMENT, new EnvironmentLookup());
}
}
Modified:
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java?rev=833923r1=833922r2=833923view=diff
==
---
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java
(original)
+++
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java
Sun Nov 8 20:53:52 2009
@@ -24,12 +24,12 @@
import java.util.List;
import java.util.Map;
+import junit.framework.TestCase;
+
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.configuration.event.ConfigurationEvent;
import org.apache.commons.configuration.event.ConfigurationListener;
-import junit.framework.TestCase;
-
/**
* A test class for some of the basic functionality implemented by
* AbstractConfiguration.
@@ -255,6 +255,31 @@
}
/**
+ * Tests whether environment variables can be interpolated.
+ */
+public void testInterpolateEnvironmentVariables()
+{
+AbstractConfiguration config = new TestConfigurationImpl(
+new PropertiesConfiguration());
+EnvironmentConfiguration envConfig = new EnvironmentConfiguration();
+Map env = new HashMap();
+for (Iterator it = envConfig.getKeys(); it.hasNext();)
+{
+String key = (String) it.next();
+String propKey = envtest. + key;
+env.put(propKey, envConfig.getProperty(key));
+config.addProperty(propKey, ${env: + key + });
+}
+assertFalse(No environment properties, env.isEmpty());
+for (Iterator it = env.entrySet().iterator(); it.hasNext();)
+{
+Map.Entry e = (Map.Entry) it.next();
+assertEquals(Wrong value for + e.getKey(), e.getValue(), config
+.getString((String) e.getKey()));
+}
+}
+
+/**
* Creates the source configuration for testing the copy() and append()
* methods. This configuration contains keys with an odd index and values
* starting with the prefix src. There are also some list properties.
svn commit: r833925 - in /commons/proper/configuration/trunk/xdocs: changes.xml userguide/howto_basicfeatures.xml
Author: oheger
Date: Sun Nov 8 20:57:49 2009
New Revision: 833925
URL: http://svn.apache.org/viewvc?rev=833925view=rev
Log:
[CONFIGURATION-399] Updated user guide and changes report.
Modified:
commons/proper/configuration/trunk/xdocs/changes.xml
commons/proper/configuration/trunk/xdocs/userguide/howto_basicfeatures.xml
Modified: commons/proper/configuration/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/xdocs/changes.xml?rev=833925r1=833924r2=833925view=diff
==
--- commons/proper/configuration/trunk/xdocs/changes.xml (original)
+++ commons/proper/configuration/trunk/xdocs/changes.xml Sun Nov 8 20:57:49
2009
@@ -23,6 +23,10 @@
body
release version=1.7 date=in SVN description=
+ action dev=oheger type=add issue=CONFIGURATION-399
+Default variable interpolation now supports the env: prefix for
+referencing environment variables.
+ /action
action dev=rgoers type=fix issue=CONFIGURATION-397
Schema violation exceptions are now propagated back to the caller.
/action
Modified:
commons/proper/configuration/trunk/xdocs/userguide/howto_basicfeatures.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/xdocs/userguide/howto_basicfeatures.xml?rev=833925r1=833924r2=833925view=diff
==
--- commons/proper/configuration/trunk/xdocs/userguide/howto_basicfeatures.xml
(original)
+++ commons/proper/configuration/trunk/xdocs/userguide/howto_basicfeatures.xml
Sun Nov 8 20:57:49 2009
@@ -165,7 +165,7 @@
variables are interpreted as the keys of other properties. This is only a
special case, the general syntax of a variable name is
code${prefix:name}/code. The prefix tells Commons Configuration that
- the variable is to evaluated in a certain context. We have already seen
+ the variable is to be evaluated in a certain context. We have already
seen
that the context is the current configuration instance if the prefix is
missing. The following other prefix names are supported by default:
table border=1
@@ -190,6 +190,11 @@
specified class will be loaded and the value of this field will be
obtained./td
/tr
+ tr
+td valign=topenv/td
+tdVariables can also reference OS-specific environment properties.
+This is indicated by the codeenv/code prefix./td
+ /tr
/table
Here are some examples (again using properties syntax):
/p
@@ -197,6 +202,8 @@
user.file = ${sys:user.home}/settings.xml
action.key = ${const:java.awt.event.KeyEvent.VK_CANCEL}
+
+java.home = ${env:JAVA_HOME}
]]/source
p
If a variable cannot be resolved, e.g. because the name is invalid or an
@@ -204,7 +211,7 @@
including the dollar sign and the curly braces.
/p
/subsection
-
+
subsection name=Customizing interpolation
p
This sub section goes a bit behind the scenes of interpolation and
svn commit: r833927 - in /commons/proper/configuration/branches/configuration2_experimental: src/main/java/org/apache/commons/configuration2/interpol/ src/test/java/org/apache/commons/configuration2/
Author: oheger
Date: Sun Nov 8 21:12:52 2009
New Revision: 833927
URL: http://svn.apache.org/viewvc?rev=833927view=rev
Log:
[CONFIGURATION-399] Ported changes to configuration2 branch.
Added:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java
(with props)
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/interpol/TestEnvironmentLookup.java
(with props)
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml
commons/proper/configuration/branches/configuration2_experimental/xdocs/userguide/howto_basicfeatures.xml
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java?rev=833927r1=833926r2=833927view=diff
==
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
Sun Nov 8 21:12:52 2009
@@ -116,6 +116,12 @@
*/
public static final String PREFIX_CONSTANTS = const;
+/**
+ * Constant for the prefix of the standard lookup object for resolving
+ * environment properties.
+ */
+public static final String PREFIX_ENVIRONMENT = env;
+
/** Constant for the prefix separator. */
private static final char PREFIX_SEPARATOR = ':';
@@ -127,7 +133,7 @@
/** Stores the default lookup object. */
private StrLookup defaultLookup;
-
+
/** Stores a parent interpolator objects if the interpolator is nested
hierarchically. */
private ConfigurationInterpolator parentInterpolator;
@@ -271,6 +277,7 @@
* @return the value of this variable or bnull/b if it cannot be
* resolved
*/
+@Override
public String lookup(String var)
{
if (var == null)
@@ -290,7 +297,7 @@
if (value != null)
{
return value;
-}
+}
}
String value = fetchNoPrefixLookup().lookup(var);
if (value == null getParentInterpolator() != null) {
@@ -330,10 +337,10 @@
}
return lookup;
}
-
+
/**
* Registers the local lookup instances for the given interpolator.
- *
+ *
* @param interpolator the instance receiving the local lookups
* @since upcoming
*/
@@ -343,8 +350,8 @@
/**
* Sets the parent interpolator. This object is used if the interpolation
is nested hierarchically
- * and the current interpolation object cannot resolve a variable.
- *
+ * and the current interpolation object cannot resolve a variable.
+ *
* @param parentInterpolator the parent interpolator object or
codenull/code
* @since upcoming
*/
@@ -355,7 +362,7 @@
/**
* Requests the parent interpolator. This object is used if the
interpolation is nested hierarchically
* and the current interpolation
- *
+ *
* @return the parent interpolator or codenull/code
* @since upcoming
*/
@@ -369,5 +376,6 @@
globalLookups = new HashMapString, StrLookup();
globalLookups.put(PREFIX_SYSPROPERTIES,
StrLookup.systemPropertiesLookup());
globalLookups.put(PREFIX_CONSTANTS, new ConstantLookup());
+globalLookups.put(PREFIX_ENVIRONMENT, new EnvironmentLookup());
}
}
Added:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java?rev=833927view=auto
==
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/interpol/EnvironmentLookup.java
(added)
+++
svn commit: r833939 - /commons/proper/net/branches/NET_2_1_RC_2/
Author: rwinston Date: Sun Nov 8 23:11:35 2009 New Revision: 833939 URL: http://svn.apache.org/viewvc?rev=833939view=rev Log: Tag Added: commons/proper/net/branches/NET_2_1_RC_2/ - copied from r833938, commons/proper/net/branches/NET_2_0/
svn commit: r833940 - /commons/proper/net/branches/NET_2_1_RC_2/
Author: rwinston Date: Sun Nov 8 23:12:19 2009 New Revision: 833940 URL: http://svn.apache.org/viewvc?rev=833940view=rev Log: Remove Removed: commons/proper/net/branches/NET_2_1_RC_2/
svn commit: r833941 - /commons/proper/net/tags/NET_2_1_RC_2/
Author: rwinston Date: Sun Nov 8 23:12:55 2009 New Revision: 833941 URL: http://svn.apache.org/viewvc?rev=833941view=rev Log: Tag Added: commons/proper/net/tags/NET_2_1_RC_2/ - copied from r833940, commons/proper/net/branches/NET_2_0/
svn commit: r833942 - in /commons/proper/net/branches/NET_2_0: NOTICE.txt pom.xml src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
Author: rwinston
Date: Sun Nov 8 23:17:55 2009
New Revision: 833942
URL: http://svn.apache.org/viewvc?rev=833942view=rev
Log:
Update for rel vote
Modified:
commons/proper/net/branches/NET_2_0/NOTICE.txt
commons/proper/net/branches/NET_2_0/pom.xml
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/ThreadContainer.java
Modified: commons/proper/net/branches/NET_2_0/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/NOTICE.txt?rev=833942r1=833941r2=833942view=diff
==
--- commons/proper/net/branches/NET_2_0/NOTICE.txt (original)
+++ commons/proper/net/branches/NET_2_0/NOTICE.txt Sun Nov 8 23:17:55 2009
@@ -1,5 +1,5 @@
Apache Commons Net
-Copyright 2001-2008 The Apache Software Foundation
+Copyright 2001-2009 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: commons/proper/net/branches/NET_2_0/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/pom.xml?rev=833942r1=833941r2=833942view=diff
==
--- commons/proper/net/branches/NET_2_0/pom.xml (original)
+++ commons/proper/net/branches/NET_2_0/pom.xml Sun Nov 8 23:17:55 2009
@@ -16,18 +16,16 @@
limitations under the License.
--
-project 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;
+project 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
groupIdorg.apache.commons/groupId
artifactIdcommons-parent/artifactId
- version11/version
+ version12/version
/parent
modelVersion4.0.0/modelVersion
groupIdcommons-net/groupId
artifactIdcommons-net/artifactId
- version2.1-SNAPSHOT/version
+ version2.1/version
nameCommons Net/name
description
A collection of network utilities and protocol implementations.
@@ -37,11 +35,11 @@
systemjira/system
urlhttp://issues.apache.org/jira/browse/NET/url
/issueManagement
- inceptionYear1997/inceptionYear
+ inceptionYear2001/inceptionYear
scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/net/branches/NET_2_0/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/net/branches/NET_2_0/developerConnection
-
urlhttp://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/net/tags/commons-net-2.1/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/net/tags/commons-net-2.1/developerConnection
+
urlhttp://svn.apache.org/viewvc/commons/proper/net/tags/commons-net-2.1/url
/scm
distributionManagement
@@ -84,7 +82,7 @@
nameRory Winston/name
idrwinston/id
emailrwins...@apache.org/email
- organization/organization
+ organization /
/developer
/developers
@@ -126,7 +124,7 @@
maven.compile.target1.5/maven.compile.target
commons.componentidnet/commons.componentid
commons.release.version2.0/commons.release.version
- commons.binary.suffix/commons.binary.suffix
+ commons.binary.suffix /
commons.jira.idNET/commons.jira.id
commons.jira.pid12310487/commons.jira.pid
/properties
@@ -175,19 +173,18 @@
configuration
tasks
jar
destfile=target/commons-net-ftp-${version}.jar
-
fileset dir=target/classes
-
includes=org/apache/commons/net/ftp/**,org/apache/commons/net/*,org/apache/commons/net/io/*,org/apache/commons/net/util/*/
+
fileset dir=target/classes
includes=org/apache/commons/net/ftp/**,org/apache/commons/net/*,org/apache/commons/net/io/*,org/apache/commons/net/util/*
/
-
metainf dir=${basedir} includes=NOTICE.txt,LICENSE.txt/
+
svn commit: r833943 - /commons/proper/net/tags/NET_2_1_RC_2/NET_2_0/
Author: rwinston Date: Sun Nov 8 23:18:17 2009 New Revision: 833943 URL: http://svn.apache.org/viewvc?rev=833943view=rev Log: Retag Added: commons/proper/net/tags/NET_2_1_RC_2/NET_2_0/ - copied from r833942, commons/proper/net/branches/NET_2_0/
svn commit: r833944 - /commons/proper/net/tags/NET_2_1_RC_3/
Author: rwinston Date: Sun Nov 8 23:20:14 2009 New Revision: 833944 URL: http://svn.apache.org/viewvc?rev=833944view=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/
