svn commit: r768677 - in /commons/proper/configuration/trunk: conf/ src/java/org/apache/commons/configuration/ src/java/org/apache/commons/configuration/resolver/ src/test/org/apache/commons/configura
Author: rgoers
Date: Sun Apr 26 07:46:18 2009
New Revision: 768677
URL: http://svn.apache.org/viewvc?rev=768677view=rev
Log:
Allow CatalogResolver to interpolate catalog entries.
Added:
commons/proper/configuration/trunk/conf/catalog2.xml
- copied, changed from r763836,
commons/proper/configuration/trunk/conf/catalog.xml
commons/proper/configuration/trunk/conf/testValidation2.xml
- copied, changed from r768095,
commons/proper/configuration/trunk/conf/testValidation.xml
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/VFSFileSystem.java
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/resolver/CatalogResolver.java
commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestVFSConfigurationBuilder.java
Copied: commons/proper/configuration/trunk/conf/catalog2.xml (from r763836,
commons/proper/configuration/trunk/conf/catalog.xml)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/conf/catalog2.xml?p2=commons/proper/configuration/trunk/conf/catalog2.xmlp1=commons/proper/configuration/trunk/conf/catalog.xmlr1=763836r2=768677rev=768677view=diff
==
--- commons/proper/configuration/trunk/conf/catalog.xml (original)
+++ commons/proper/configuration/trunk/conf/catalog2.xml Sun Apr 26 07:46:18
2009
@@ -5,5 +5,6 @@
uri=resolver.dtd/
rewriteSystem systemIdStartString=http://java.sun.com/dtd/;
rewritePrefix=.//
- rewriteSystem systemIdStartString=http://commons.apache.org/;
rewritePrefix=.//
+ rewriteSystem systemIdStartString=http://commons.apache.org/;
+ rewritePrefix=file://${sys:user.dir}/conf//
/catalog
\ No newline at end of file
Copied: commons/proper/configuration/trunk/conf/testValidation2.xml (from
r768095, commons/proper/configuration/trunk/conf/testValidation.xml)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/conf/testValidation2.xml?p2=commons/proper/configuration/trunk/conf/testValidation2.xmlp1=commons/proper/configuration/trunk/conf/testValidation.xmlr1=768095r2=768677rev=768677view=diff
==
--- commons/proper/configuration/trunk/conf/testValidation.xml (original)
+++ commons/proper/configuration/trunk/conf/testValidation2.xml Sun Apr 26
07:46:18 2009
@@ -6,11 +6,11 @@
nodeCombiner
config-class=org.apache.commons.configuration.tree.OverrideCombiner/
expressionEngine
config-class=org.apache.commons.configuration.tree.xpath.XPathExpressionEngine/
/result
-entity-resolver catalogFiles=catalog.xml/
+entity-resolver catalogFiles=file://${sys:user.dir}/conf/catalog2.xml/
/header
system/
properties fileName=test.properties.xml throwExceptionOnMissing=true
config-name=properties
/properties
- xml fileName=sample.xml config-name=xml schemaValidation=true/
+ xml fileName=file://${sys:user.dir}/conf/sample.xml config-name=xml
schemaValidation=true/
/configuration
\ No newline at end of file
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java?rev=768677r1=768676r2=768677view=diff
==
---
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
(original)
+++
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
Sun Apr 26 07:46:18 2009
@@ -749,6 +749,7 @@
EntityResolver resolver = (EntityResolver)
BeanHelper.createBean(decl, CatalogResolver.class);
BeanHelper.setProperty(resolver, fileSystem, getFileSystem());
BeanHelper.setProperty(resolver, baseDir, getBasePath());
+BeanHelper.setProperty(resolver, substitutor, getSubstitutor());
setEntityResolver(resolver);
}
}
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/VFSFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/VFSFileSystem.java?rev=768677r1=768676r2=768677view=diff
==
---
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/VFSFileSystem.java
(original)
+++
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/VFSFileSystem.java
Sun Apr 26 07:46:18 2009
@@ -285,8 +285,10 @@
public URL
svn commit: r768678 - in /commons/proper/configuration/branches/configuration2_experimental/src: main/java/org/apache/commons/configuration2/ main/java/org/apache/commons/configuration2/resolver/ test
Author: rgoers
Date: Sun Apr 26 07:46:32 2009
New Revision: 768678
URL: http://svn.apache.org/viewvc?rev=768678view=rev
Log:
Allow CatalogResolver to interpolate catalog entries.
Added:
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/catalog2.xml
(with props)
commons/proper/configuration/branches/configuration2_experimental/src/test/resources/testValidation2.xml
(with props)
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/VFSFileSystem.java
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestVFSConfigurationBuilder.java
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java?rev=768678r1=768677r2=768678view=diff
==
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
Sun Apr 26 07:46:32 2009
@@ -755,6 +755,7 @@
EntityResolver resolver = (EntityResolver)
BeanHelper.createBean(decl, CatalogResolver.class);
BeanHelper.setProperty(resolver, fileSystem, getFileSystem());
BeanHelper.setProperty(resolver, baseDir, getBasePath());
+BeanHelper.setProperty(resolver, substitutor, getSubstitutor());
setEntityResolver(resolver);
}
}
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/VFSFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/VFSFileSystem.java?rev=768678r1=768677r2=768678view=diff
==
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/VFSFileSystem.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/VFSFileSystem.java
Sun Apr 26 07:46:32 2009
@@ -285,8 +285,10 @@
public URL locateFromURL(String basePath, String fileName)
{
-if ((basePath != null UriParser.extractScheme(basePath) == null)
-|| (basePath == null UriParser.extractScheme(fileName) == null))
+String fileScheme = UriParser.extractScheme(fileName);
+
+// Use DefaultFileSystem if basePath and fileName don't have a scheme.
+if ((basePath == null || UriParser.extractScheme(basePath) == null)
fileScheme == null)
{
return super.locateFromURL(basePath, fileName);
}
@@ -295,7 +297,8 @@
FileSystemManager fsManager = VFS.getManager();
FileObject file;
-if (basePath != null)
+// Only use the base path if the file name doesn't have a scheme.
+if (basePath != null fileScheme == null)
{
FileObject base = fsManager.resolveFile(basePath);
if (base.getType() == FileType.FILE)
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java?rev=768678r1=768677r2=768678view=diff
==
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
Sun Apr 26 07:46:32 2009
@@ -24,6 +24,7 @@
import org.apache.commons.configuration2.FileSystem;
import org.apache.commons.configuration2.ConfigurationException;
import org.apache.commons.configuration2.ConfigurationUtils;
+import
svn commit: r768709 - in /commons/proper/exec/trunk/src/main/java/org/apache/commons/exec: CommandLine.java environment/DefaultProcessingEnvironment.java util/StringUtils.java
Author: sebb
Date: Sun Apr 26 14:08:41 2009
New Revision: 768709
URL: http://svn.apache.org/viewvc?rev=768709view=rev
Log:
Typos: seperator = separator
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/DefaultProcessingEnvironment.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java?rev=768709r1=768708r2=768709view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/CommandLine.java
Sun Apr 26 14:08:41 2009
@@ -116,7 +116,7 @@
*/
public String getExecutable() {
// Expand the executable and replace '/' and '\\' with the platform
-// specific file seperator char. This is safe here since we know
+// specific file separator char. This is safe here since we know
// that this is a platform specific command.
return StringUtils.fixFileSeparatorChar(expandArgument(executable));
}
@@ -392,7 +392,7 @@
/**
* Get the executable - the argument is trimmed and '/' and '\\' are
- * replaced with the platform specific file seperator char
+ * replaced with the platform specific file separator char
*
* @param executable the executable
* @return the platform-specific executable string
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/DefaultProcessingEnvironment.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/DefaultProcessingEnvironment.java?rev=768709r1=768708r2=768709view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/DefaultProcessingEnvironment.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/DefaultProcessingEnvironment.java
Sun Apr 26 14:08:41 2009
@@ -44,7 +44,7 @@
*/
public class DefaultProcessingEnvironment {
-/** the line seperator of the system */
+/** the line separator of the system */
private static final String LINE_SEPARATOR =
System.getProperty(line.separator);
/** the environment variables of the process */
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java?rev=768709r1=768708r2=768709view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java
Sun Apr 26 14:08:41 2009
@@ -132,7 +132,7 @@
/**
* Split a string into an array of strings based
- * on a a seperator.
+ * on a separator.
*
* @param input what to split
* @param splitChar what to split on
@@ -165,10 +165,10 @@
}
/**
- * Concatenates an array of string using a seperator.
+ * Concatenates an array of string using a separator.
*
* @param strings the strings to concatenate
- * @param separator the seperator between two strings
+ * @param separator the separator between two strings
* @return the concatened strings
*/
public static String toString(String[] strings, String separator) {
svn commit: r768716 - /commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/CommandLineTest.java
Author: sebb
Date: Sun Apr 26 15:01:06 2009
New Revision: 768716
URL: http://svn.apache.org/viewvc?rev=768716view=rev
Log:
setSubMap only needs to be called once
Add test to correspond with new Tutorial example
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/CommandLineTest.java
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/CommandLineTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/CommandLineTest.java?rev=768716r1=768715r2=768716view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/CommandLineTest.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/CommandLineTest.java
Sun Apr 26 15:01:06 2009
@@ -353,9 +353,9 @@
// build the command line
cmdl = new CommandLine(${JAVA_HOME}\\bin\\java);
-cmdl.addArguments(-class);
-cmdl.addArguments(${appMainClass});
-cmdl.addArguments(${file});
+cmdl.addArgument(-class);
+cmdl.addArgument(${appMainClass});
+cmdl.addArgument(${file});
// build the first command line
substitutionMap.put(file, C:\\Document And
Settings\\documents\\432431.pdf);
@@ -363,7 +363,7 @@
result = cmdl.toStrings();
// verify the first command line
-// please note - the executable argument is changed to using platform
specific file sperator char
+// please note - the executable argument is changed to using platform
specific file separator char
// whereas all other variable substitution are not touched
assertEquals(StringUtils.fixFileSeparatorChar(C:\\Programme\\jdk1.5.0_12\\bin\\java),
result[0]);
assertEquals(-class, result[1]);
@@ -381,7 +381,6 @@
// build the second command line with updated parameters resulting in
a different command line
substitutionMap.put(file, C:\\Document And
Settings\\documents\\432432.pdf);
-cmdl.setSubstitutionMap(substitutionMap);
result = cmdl.toStrings();
assertEquals(StringUtils.fixFileSeparatorChar(C:\\Programme\\jdk1.5.0_12\\bin\\java),
result[0]);
assertEquals(-class, result[1]);
@@ -389,6 +388,21 @@
assertEquals(C:\\Document And Settings\\documents\\432432.pdf,
result[3]);
}
+public void testCommandLineParsingWithExpansion3(){
+CommandLine cmdl = CommandLine.parse(AcroRd32.exe);
+cmdl.addArgument(/p);
+cmdl.addArgument(/h);
+cmdl.addArgument(${file});
+HashMap params = new HashMap();
+params.put(file, C:\\Document And Settings\\documents\\432432.pdf);
+cmdl.setSubstitutionMap(params);
+String[] result = cmdl.toStrings();
+assertEquals(AcroRd32.exe, result[0]);
+assertEquals(/p, result[1]);
+assertEquals(/h, result[2]);
+assertEquals(C:\\Document And Settings\\documents\\432432.pdf,
result[3]);
+
+}
/**
* Test the toString() method
*/
svn commit: r768717 - /commons/proper/exec/trunk/src/site/apt/tutorial.apt
Author: sebb
Date: Sun Apr 26 15:02:39 2009
New Revision: 768717
URL: http://svn.apache.org/viewvc?rev=768717view=rev
Log:
EXEC-38 - use addArgument() not addArguments()
Also remove Jakarta branding
Add another substitution example
Modified:
commons/proper/exec/trunk/src/site/apt/tutorial.apt
Modified: commons/proper/exec/trunk/src/site/apt/tutorial.apt
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/site/apt/tutorial.apt?rev=768717r1=768716r2=768717view=diff
==
--- commons/proper/exec/trunk/src/site/apt/tutorial.apt (original)
+++ commons/proper/exec/trunk/src/site/apt/tutorial.apt Sun Apr 26 15:02:39 2009
@@ -17,13 +17,13 @@
~~
-Jakarta Commons Exec Tutorial
+Apache Commons Exec Tutorial
12 November 2008
-Jakarta Commons Exec
+Apache Commons Exec
* The First Encounter
@@ -33,7 +33,7 @@
with tons of code.
Well, we learned it the hard way (in my case more than once) that using
plain Runtime.exec() can be
- a painful experience. Therefore you are invited to delve into commons-exec
and having a look at the
+ a painful experience. Therefore you are invited to delve into commons-exec
and have a look at the
hard lessons the easy way ...
* Taming Your First Process
@@ -66,18 +66,18 @@
* To Watchdog Or Not To Watchdog
- You happily printed a while but now your application blocks - your printing
subprocess
- hangs for some obvious or not so obvious reasons. Starting is easy but what
to do with a run-away
- Acrobat Reader?! Luckily commons-exec provides a watchdog doing the work for
you and here is
- the improved code
+ You happily printed for a while but now your application blocks - your
printing subprocess
+ hangs for some obvious or not so obvious reason. Starting is easy but what
to do with a run-away
+ Acrobat Reader?! Luckily commons-exec provides a watchdog which does the
work for you.
+ Here is the improved code
+
String line = AcroRd32.exe /p /h + file.getAbsolutePath();
CommandLine commandLine = CommandLine.parse(line);
-ExecuteWatchdog watchdog = new ExecuteWatchdog(6);
DefaultExecutor executor = new DefaultExecutor();
-executor.setWatchdog(watchdog);
executor.setExitValue(1);
+ExecuteWatchdog watchdog = new ExecuteWatchdog(6);
+executor.setWatchdog(watchdog);
int exitValue = executor.execute(commandLine);
+
@@ -99,10 +99,10 @@
+
String line = AcroRd32.exe /p /h \ + file.getAbsolutePath() + \;
CommandLine commandLine = CommandLine.parse(line);
-ExecuteWatchdog watchdog = new ExecuteWatchdog(6);
DefaultExecutor executor = new DefaultExecutor();
-executor.setWatchdog(watchdog);
executor.setExitValue(1);
+ExecuteWatchdog watchdog = new ExecuteWatchdog(6);
+executor.setWatchdog(watchdog);
int exitValue = executor.execute(commandLine);
+
@@ -118,13 +118,13 @@
+
CommandLine commandLine = CommandLine.parse(AcroRd32.exe);
-commandLine.addArguments(/p);
-commandLine.addArguments(/h);
-commandLine.addArguments(file.getAbsolutePath());
-ExecuteWatchdog watchdog = new ExecuteWatchdog(6);
+commandLine.addArgument(/p);
+commandLine.addArgument(/h);
+commandLine.addArgument(file.getAbsolutePath());
DefaultExecutor executor = new DefaultExecutor();
-executor.setWatchdog(watchdog);
executor.setExitValue(1);
+ExecuteWatchdog watchdog = new ExecuteWatchdog(6);
+executor.setWatchdog(watchdog);
int exitValue = executor.execute(commandLine);
+
@@ -141,5 +141,15 @@
HashMap params = new HashMap();
params.put(file, C:\Document And Settings\documents\432432.pdf);
commandLine = CommandLine.parse(AcroRd32.exe /p /h \${file}\, params);
+
+// Or you can use expansion with individual parameters:
+
+CommandLine commandLine = CommandLine.parse(AcroRd32.exe);
+commandLine.addArgument(/p);
+commandLine.addArgument(/h);
+commandLine.addArgument(${file});
+HashMap params = new HashMap();
+params.put(file, C:\Document And Settings\documents\432432.pdf);
+commandLine.setSubstitutionMap(params);
+
\ No newline at end of file
svn commit: r768727 - /commons/proper/math/trunk/src/test/org/apache/commons/math/TestUtils.java
Author: psteitz
Date: Sun Apr 26 17:14:59 2009
New Revision: 768727
URL: http://svn.apache.org/viewvc?rev=768727view=rev
Log:
Improved error messages.
Modified:
commons/proper/math/trunk/src/test/org/apache/commons/math/TestUtils.java
Modified:
commons/proper/math/trunk/src/test/org/apache/commons/math/TestUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/TestUtils.java?rev=768727r1=768726r2=768727view=diff
==
--- commons/proper/math/trunk/src/test/org/apache/commons/math/TestUtils.java
(original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/TestUtils.java
Sun Apr 26 17:14:59 2009
@@ -93,11 +93,8 @@
/**
* Verifies that two double arrays have equal entries, up to tolerance
*/
-public static void assertEquals(double a[], double b[], double tolerance) {
-Assert.assertEquals(a.length, b.length);
-for (int i = 0; i a.length; i++) {
-Assert.assertEquals(a[i], b[i], tolerance);
-}
+public static void assertEquals(double expected[], double observed[],
double tolerance) {
+assertEquals(Array comparison failure, expected, observed,
tolerance);
}
/**
@@ -312,14 +309,34 @@
}
/** verifies that two arrays are close (sup norm) */
-public static void assertEquals(String msg, double[] m, double[] n,
+public static void assertEquals(String msg, double[] expected, double[]
observed,
double tolerance) {
-if (m.length != n.length) {
-Assert.fail(vectors not same length);
+StringBuffer out = new StringBuffer(msg);
+if (expected.length != observed.length) {
+out.append(\n Arrays not same length. \n);
+out.append(expected has length );
+out.append(expected.length);
+out.append( observed length = );
+out.append(observed.length);
+Assert.fail(out.toString());
}
-for (int i = 0; i m.length; i++) {
-Assert.assertEquals(msg + + i + elements differ,
-m[i],n[i],tolerance);
+boolean failure = false;
+for (int i=0; i expected.length; i++) {
+try {
+Assert.assertEquals(expected[i], observed[i], tolerance);
+} catch (AssertionFailedError ex) {
+failure = true;
+out.append(\n Elements at index );
+out.append(i);
+out.append( differ. );
+out.append( expected = );
+out.append(expected[i]);
+out.append( observed = );
+out.append(observed[i]);
+}
+}
+if (failure) {
+Assert.fail(out.toString());
}
}
svn commit: r768750 - /commons/proper/io/trunk/src/java/org/apache/commons/io/filefilter/NotFileFilter.java
Author: niallp Date: Sun Apr 26 19:24:43 2009 New Revision: 768750 URL: http://svn.apache.org/viewvc?rev=768750view=rev Log: Fix IO-202 NotFileFilter documentation is incorrect - thanks to Matthew Flaschen for the patch Modified: commons/proper/io/trunk/src/java/org/apache/commons/io/filefilter/NotFileFilter.java Modified: commons/proper/io/trunk/src/java/org/apache/commons/io/filefilter/NotFileFilter.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/filefilter/NotFileFilter.java?rev=768750r1=768749r2=768750view=diff == --- commons/proper/io/trunk/src/java/org/apache/commons/io/filefilter/NotFileFilter.java (original) +++ commons/proper/io/trunk/src/java/org/apache/commons/io/filefilter/NotFileFilter.java Sun Apr 26 19:24:43 2009 @@ -33,7 +33,7 @@ private final IOFileFilter filter; /** - * Constructs a new file filter that NOTs the result of another filters. + * Constructs a new file filter that NOTs the result of another filter. * * @param filter the filter, must not be null * @throws IllegalArgumentException if the filter is null @@ -46,7 +46,7 @@ } /** - * Checks to see if both filters are true. + * Returns the logical NOT of the underlying filter's return value for the same File. * * @param file the File to check * @return true if the filter returns false @@ -57,7 +57,7 @@ } /** - * Checks to see if both filters are true. + * Returns the logical NOT of the underlying filter's return value for the same arguments. * * @param file the File directory * @param name the filename
svn commit: r768866 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich
Date: Mon Apr 27 04:39:35 2009
New Revision: 768866
URL: http://svn.apache.org/viewvc?rev=768866view=rev
Log:
Adding release profile distributionManagement
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=768866r1=768865r2=768866view=diff
==
--- commons/proper/dbutils/trunk/pom.xml [utf-8] (original)
+++ commons/proper/dbutils/trunk/pom.xml [utf-8] Mon Apr 27 04:39:35 2009
@@ -281,6 +281,18 @@
/site
/distributionManagement
/profile
+profile
+ idrelease/id
+ distributionManagement
+!-- Cannot define in parent ATM, see COMMONSSITE-26 --
+site
+ idapache.website/id
+ nameApache Commons Release Site/name
+
url${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/dbutils//url
+/site
+ /distributionManagement
+/profile
/profiles
+
/project
