svn commit: r1196513 - in /commons/proper/daemon/trunk: build.xml pom.xml src/assembly/ src/java/ src/main/ src/main/assembly/ src/main/java/ src/test/java/ src/test/java/org/ src/test/org/
Author: sebb Date: Wed Nov 2 09:14:58 2011 New Revision: 1196513 URL: http://svn.apache.org/viewvc?rev=1196513&view=rev Log: Maven standard locations Added: commons/proper/daemon/trunk/src/main/ commons/proper/daemon/trunk/src/main/assembly/ - copied from r1173172, commons/proper/daemon/trunk/src/assembly/ commons/proper/daemon/trunk/src/main/java/ - copied from r1173172, commons/proper/daemon/trunk/src/java/ commons/proper/daemon/trunk/src/test/java/ commons/proper/daemon/trunk/src/test/java/org/ - copied from r1173172, commons/proper/daemon/trunk/src/test/org/ Removed: commons/proper/daemon/trunk/src/assembly/ commons/proper/daemon/trunk/src/java/ commons/proper/daemon/trunk/src/test/org/ Modified: commons/proper/daemon/trunk/build.xml commons/proper/daemon/trunk/pom.xml Modified: commons/proper/daemon/trunk/build.xml URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/build.xml?rev=1196513&r1=1196512&r2=1196513&view=diff == --- commons/proper/daemon/trunk/build.xml (original) +++ commons/proper/daemon/trunk/build.xml Wed Nov 2 09:14:58 2011 @@ -71,10 +71,10 @@ - + - + Modified: commons/proper/daemon/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/pom.xml?rev=1196513&r1=1196512&r2=1196513&view=diff == --- commons/proper/daemon/trunk/pom.xml (original) +++ commons/proper/daemon/trunk/pom.xml Wed Nov 2 09:14:58 2011 @@ -98,8 +98,6 @@ -src/java -src/test
svn commit: r1196521 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java
Author: luc Date: Wed Nov 2 09:36:14 2011 New Revision: 1196521 URL: http://svn.apache.org/viewvc?rev=1196521&view=rev Log: Fixed a typo in variable name leading it to be ignored. Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java?rev=1196521&r1=1196520&r2=1196521&view=diff == --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java Wed Nov 2 09:36:14 2011 @@ -289,7 +289,7 @@ public class CMAESOptimizer } } this.maxIterations = maxIterations; -this.stopfitness = stopfitness; +this.stopfitness = stopFitness; this.isActiveCMA = isActiveCMA; this.diagonalOnly = diagonalOnly; this.checkFeasableCount = checkFeasableCount;
svn commit: r1196553 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java
Author: erans
Date: Wed Nov 2 12:07:53 2011
New Revision: 1196553
URL: http://svn.apache.org/viewvc?rev=1196553&view=rev
Log:
Naming of variable.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java?rev=1196553&r1=1196552&r2=1196553&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/CMAESOptimizer.java
Wed Nov 2 12:07:53 2011
@@ -83,7 +83,7 @@ public class CMAESOptimizer
implements MultivariateRealOptimizer {
/** Default value for {@link #checkFeasableCount}: {@value}. */
public static final int DEFAULT_CHECKFEASABLECOUNT = 0;
-/** Default value for {@link #stopfitness}: {@value}. */
+/** Default value for {@link #stopFitness}: {@value}. */
public static final double DEFAULT_STOPFITNESS = 0;
/** Default value for {@link #isActiveCMA}: {@value}. */
public static final boolean DEFAULT_ISACTIVECMA = true;
@@ -148,7 +148,7 @@ public class CMAESOptimizer
/** Maximal number of iterations allowed. */
private int maxIterations;
/** Limit for fitness value. */
-private double stopfitness;
+private double stopFitness;
/** Stop if x-changes larger stopTolUpX. */
private double stopTolUpX;
/** Stop if x-change smaller stopTolX. */
@@ -289,7 +289,7 @@ public class CMAESOptimizer
}
}
this.maxIterations = maxIterations;
-this.stopfitness = stopFitness;
+this.stopFitness = stopFitness;
this.isActiveCMA = isActiveCMA;
this.diagonalOnly = diagonalOnly;
this.checkFeasableCount = checkFeasableCount;
@@ -407,8 +407,8 @@ public class CMAESOptimizer
}
// handle termination criteria
// Break, if fitness is good enough
-if (stopfitness != 0) { // only if stopfitness is defined
-if (bestFitness < (isMinimize ? stopfitness :
-stopfitness)) {
+if (stopFitness != 0) { // only if stopFitness is defined
+if (bestFitness < (isMinimize ? stopFitness :
-stopFitness)) {
break generationLoop;
}
}
svn commit: r1196555 - /commons/proper/vfs/trunk/pom.xml
Author: ggregory Date: Wed Nov 2 12:19:38 2011 New Revision: 1196555 URL: http://svn.apache.org/viewvc?rev=1196555&view=rev Log: [VFS-375] Upgrade to Apache Commons Compress 1.3 from 1.2. Modified: commons/proper/vfs/trunk/pom.xml Modified: commons/proper/vfs/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1196555&r1=1196554&r2=1196555&view=diff == --- commons/proper/vfs/trunk/pom.xml (original) +++ commons/proper/vfs/trunk/pom.xml Wed Nov 2 12:19:38 2011 @@ -315,7 +315,7 @@ org.apache.commons commons-compress -1.2 +1.3 org.apache.jackrabbit
svn commit: r1196559 - /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
Author: ggregory
Date: Wed Nov 2 12:56:05 2011
New Revision: 1196559
URL: http://svn.apache.org/viewvc?rev=1196559&view=rev
Log:
Fix typo in error message.
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java?rev=1196559&r1=1196558&r2=1196559&view=diff
==
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
Wed Nov 2 12:56:05 2011
@@ -132,7 +132,7 @@ public class DelegatingFileSystemOptions
{
for (int i=0; i < schemes.length; ++i)
{
-assertTrue("Missing" + schemes[i] + " provider",
fsm.hasProvider(schemes[i]));
+assertTrue("Missing " + schemes[i] + " provider",
fsm.hasProvider(schemes[i]));
}
}
}
svn commit: r1196611 - /commons/proper/vfs/trunk/src/changes/changes.xml
Author: ggregory Date: Wed Nov 2 14:47:56 2011 New Revision: 1196611 URL: http://svn.apache.org/viewvc?rev=1196611&view=rev Log: [VFS-375] Upgrade to Apache Commons Compress 1.3 from 1.2. Modified: commons/proper/vfs/trunk/src/changes/changes.xml Modified: commons/proper/vfs/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1196611&r1=1196610&r2=1196611&view=diff == --- commons/proper/vfs/trunk/src/changes/changes.xml (original) +++ commons/proper/vfs/trunk/src/changes/changes.xml Wed Nov 2 14:47:56 2011 @@ -23,6 +23,9 @@ + +Upgrade to Apache Commons Compress 1.3 from 1.2. + Incorrect lazy initialization of static field org.apache.commons.vfs2.util.Messages.resources in org.apache.commons.vfs2.util.Messages.findMessage(String)Add FileContent write APIs.
svn commit: r1196612 - /commons/proper/vfs/trunk/src/changes/changes.xml
Author: ggregory Date: Wed Nov 2 14:48:14 2011 New Revision: 1196612 URL: http://svn.apache.org/viewvc?rev=1196612&view=rev Log: [VFS-375] Upgrade to Apache Commons Compress 1.3 from 1.2. Modified: commons/proper/vfs/trunk/src/changes/changes.xml Modified: commons/proper/vfs/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1196612&r1=1196611&r2=1196612&view=diff == --- commons/proper/vfs/trunk/src/changes/changes.xml (original) +++ commons/proper/vfs/trunk/src/changes/changes.xml Wed Nov 2 14:48:14 2011 @@ -23,7 +23,7 @@ - + Upgrade to Apache Commons Compress 1.3 from 1.2.
svn commit: r1196613 - in /commons/proper/vfs/trunk: core/ core/src/main/java/org/apache/commons/vfs2/impl/ core/src/main/java/org/apache/commons/vfs2/provider/tar/ src/changes/
Author: ggregory
Date: Wed Nov 2 14:51:09 2011
New Revision: 1196613
URL: http://svn.apache.org/viewvc?rev=1196613&view=rev
Log:
[VFS-377] Replace custom TAR code with Apache Commons Compress 1.3.
Removed:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarBuffer.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarConstants.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarEntry.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarInputStream.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarUtils.java
Modified:
commons/proper/vfs/trunk/core/pom.xml
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
commons/proper/vfs/trunk/src/changes/changes.xml
Modified: commons/proper/vfs/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/pom.xml?rev=1196613&r1=1196612&r2=1196613&view=diff
==
--- commons/proper/vfs/trunk/core/pom.xml (original)
+++ commons/proper/vfs/trunk/core/pom.xml Wed Nov 2 14:51:09 2011
@@ -52,7 +52,6 @@
org.apache.commons
commons-compress
- test
commons-collections
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml?rev=1196613&r1=1196612&r2=1196613&view=diff
==
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml
Wed Nov 2 14:51:09 2011
@@ -25,7 +25,7 @@
-
+
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java?rev=1196613&r1=1196612&r2=1196613&view=diff
==
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
Wed Nov 2 14:51:09 2011
@@ -16,11 +16,10 @@
*/
package org.apache.commons.vfs2.provider.tar;
-//TODO: Revert to [compress]
-//import org.apache.commons.compress.tar.TarEntry;
import java.io.InputStream;
import java.util.HashSet;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileType;
@@ -33,14 +32,14 @@ import org.apache.commons.vfs2.provider.
*/
public class TarFileObject extends AbstractFileObject
{
-/** The TarEntry */
-protected TarEntry entry;
+/** The TarArchiveEntry */
+protected TarArchiveEntry entry;
private final HashSet children = new HashSet();
private final TarFileSystem fs;
private FileType type;
protected TarFileObject(AbstractFileName name,
-TarEntry entry,
+TarArchiveEntry entry,
TarFileSystem fs,
boolean tarExists) throws FileSystemException
{
@@ -56,7 +55,7 @@ public class TarFileObject extends Abstr
/**
* Sets the details for this file object.
*/
-protected void setTarEntry(final TarEntry entry)
+protected void setTarEntry(final TarArchiveEntry entry)
{
if (this.entry != null)
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java?rev=1196613&r1=1196612&r2=1196613&view=diff
==
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java
Wed Nov 2 14:51:09 2011
@@ -16,9 +16,6 @@
*/
package org.apache.commons.vfs2.provider.tar;
-//TODO: Revert to [compress]
-//import org.apache.commons.com
svn commit: r1196638 - in /commons/proper/vfs/trunk: core/src/main/java/org/apache/commons/vfs2/Resources.properties src/changes/changes.xml
Author: ggregory
Date: Wed Nov 2 15:39:25 2011
New Revision: 1196638
URL: http://svn.apache.org/viewvc?rev=1196638&view=rev
Log:
[VFS-378] Tar error message are missing from resource file.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/Resources.properties
commons/proper/vfs/trunk/src/changes/changes.xml
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/Resources.properties
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/Resources.properties?rev=1196638&r1=1196637&r2=1196638&view=diff
==
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/Resources.properties
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/Resources.properties
Wed Nov 2 15:39:25 2011
@@ -265,6 +265,10 @@ vfs.provider.sftp/known-hosts.error=Erro
vfs.provider.sftp/StrictHostKeyChecking-arg.error=Illegal argument "{0}"
hostKeyChecking can only be "ask", "yes" or "no"
vfs.provider.sftp/change-work-directory-back.error=Could not change back to
work directory "{0}".
+# Tar
+vfs.provider.tar/open-tar-file.error=Could not open Tar file "{0}".
+vfs.provider.tar/close-tar-file.error=Could not close Tar file "{0}".
+
# Ant tasks
vfs.tasks/sync.no-destination.error=No destination file or directory specified.
vfs.tasks/sync.too-many-destinations.error=Cannot specify both a destination
file and a destination directory.
Modified: commons/proper/vfs/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1196638&r1=1196637&r2=1196638&view=diff
==
--- commons/proper/vfs/trunk/src/changes/changes.xml (original)
+++ commons/proper/vfs/trunk/src/changes/changes.xml Wed Nov 2 15:39:25 2011
@@ -23,6 +23,9 @@
+
+Tar error message are missing from resource file.
+
Replace custom TAR code with Apache Commons Compress 1.3.
svn commit: r1196654 - /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractTestSuite.java
Author: ggregory
Date: Wed Nov 2 15:55:13 2011
New Revision: 1196654
URL: http://svn.apache.org/viewvc?rev=1196654&view=rev
Log:
Remove ".\n" from test output.
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractTestSuite.java
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractTestSuite.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractTestSuite.java?rev=1196654&r1=1196653&r2=1196654&view=diff
==
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractTestSuite.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractTestSuite.java
Wed Nov 2 15:55:13 2011
@@ -201,16 +201,12 @@ public abstract class AbstractTestSuite
fTest = null;
// force the SoftRefFilesChache to free all files
-System.err.println(".");
System.gc();
Thread.sleep(1000);
-System.err.println(".");
System.gc();
Thread.sleep(1000);
-System.err.println(".");
System.gc();
Thread.sleep(1000);
-System.err.println(".");
System.gc();
Thread.sleep(1000);
svn commit: r1196665 - in /commons/proper/compress/trunk: ./ src/main/java/org/apache/commons/compress/compressors/ src/main/java/org/apache/commons/compress/compressors/xz/
Author: bodewig
Date: Wed Nov 2 16:13:41 2011
New Revision: 1196665
URL: http://svn.apache.org/viewvc?rev=1196665&view=rev
Log:
support for XZ compression format submitted by Lasse Collin. COMPRESS-156
Added:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStream.java
(with props)
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/XZCompressorOutputStream.java
(with props)
Modified:
commons/proper/compress/trunk/pom.xml
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
Modified: commons/proper/compress/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/pom.xml?rev=1196665&r1=1196664&r2=1196665&view=diff
==
--- commons/proper/compress/trunk/pom.xml (original)
+++ commons/proper/compress/trunk/pom.xml Wed Nov 2 16:13:41 2011
@@ -56,6 +56,11 @@
4.10
test
+
+ org.tukaani
+ xz
+ 1.0
+
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java?rev=1196665&r1=1196664&r2=1196665&view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
Wed Nov 2 16:13:41 2011
@@ -26,6 +26,8 @@ import org.apache.commons.compress.compr
import
org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
+import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
+import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
import
org.apache.commons.compress.compressors.pack200.Pack200CompressorInputStream;
import
org.apache.commons.compress.compressors.pack200.Pack200CompressorOutputStream;
@@ -62,6 +64,7 @@ public class CompressorStreamFactory {
* @since Commons Compress 1.1
*/
public static final String BZIP2 = "bzip2";
+
/**
* Constant used to identify the GZIP compression algorithm.
* @since Commons Compress 1.1
@@ -74,6 +77,12 @@ public class CompressorStreamFactory {
public static final String PACK200 = "pack200";
/**
+ * Constant used to identify the XZ compression method.
+ * @since Commons Compress 1.4
+ */
+public static final String XZ = "xz";
+
+/**
* Create an compressor input stream from an input stream, autodetecting
* the compressor type from the first few bytes of the stream. The
InputStream
* must support marks, like BufferedInputStream.
@@ -108,6 +117,10 @@ public class CompressorStreamFactory {
return new GzipCompressorInputStream(in);
}
+if (XZCompressorInputStream.matches(signature, signatureLength)) {
+return new XZCompressorInputStream(in);
+}
+
if (Pack200CompressorInputStream.matches(signature,
signatureLength)) {
return new Pack200CompressorInputStream(in);
}
@@ -122,7 +135,7 @@ public class CompressorStreamFactory {
/**
* Create a compressor input stream from a compressor name and an input
stream.
*
- * @param name of the compressor, i.e. "gz", "bzip2" or "pack200"
+ * @param name of the compressor, i.e. "gz", "bzip2", "xz", or "pack200"
* @param in the input stream
* @return compressor input stream
* @throws CompressorException if the compressor name is not known
@@ -145,6 +158,10 @@ public class CompressorStreamFactory {
return new BZip2CompressorInputStream(in);
}
+if (XZ.equalsIgnoreCase(name)) {
+return new XZCompressorInputStream(in);
+}
+
if (PACK200.equalsIgnoreCase(name)) {
return new Pack200CompressorInputStream(in);
}
@@ -159,7 +176,7 @@ public class CompressorStreamFactory {
/**
* Create an compressor output stream from an compressor name and an input
stream.
*
- * @param name the compressor name, i.e. "gz", "bzip2" or "pack200"
+ * @param name the compressor name, i.e. "gz", "bzip2", "xz", or "pack200"
* @param out the output stream
* @return the compressor output stream
*
svn commit: r1196670 - in /commons/proper/vfs/trunk: core/src/main/java/org/apache/commons/vfs2/impl/ core/src/main/java/org/apache/commons/vfs2/provider/bzip2/ src/changes/
Author: ggregory
Date: Wed Nov 2 16:23:32 2011
New Revision: 1196670
URL: http://svn.apache.org/viewvc?rev=1196670&view=rev
Log:
[VFS-379] Replace custom BZIP2 code with Apache Commons Compress 1.3.
Removed:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/BZip2Constants.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/CBZip2InputStream.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/CBZip2OutputStream.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/CRC.java
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
commons/proper/vfs/trunk/src/changes/changes.xml
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml?rev=1196670&r1=1196669&r2=1196670&view=diff
==
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml
Wed Nov 2 16:23:32 2011
@@ -30,7 +30,7 @@
-
+
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java?rev=1196670&r1=1196669&r2=1196670&view=diff
==
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
Wed Nov 2 16:23:32 2011
@@ -16,13 +16,12 @@
*/
package org.apache.commons.vfs2.provider.bzip2;
-//TODO: Revert to [compress]
-//import org.apache.commons.compress.bzip2.CBZip2InputStream;
-//import org.apache.commons.compress.bzip2.CBZip2OutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import
org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
+import
org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.provider.AbstractFileName;
@@ -51,22 +50,13 @@ public class Bzip2FileObject extends Com
public static InputStream wrapInputStream(final String name, final
InputStream is) throws IOException
{
-final int b1 = is.read();
-final int b2 = is.read();
-if (b1 != 'B' || b2 != 'Z')
-{
-throw new
FileSystemException("vfs.provider.compressedFile/not-a-compressedFile-file.error",
name);
-}
-return new CBZip2InputStream(is);
+return new BZip2CompressorInputStream(is);
}
@Override
protected OutputStream doGetOutputStream(boolean bAppend) throws Exception
{
OutputStream os = getContainer().getContent().getOutputStream(false);
-os.write('B');
-os.write('Z');
-
-return new CBZip2OutputStream(os);
+return new BZip2CompressorOutputStream(os);
}
}
Modified: commons/proper/vfs/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1196670&r1=1196669&r2=1196670&view=diff
==
--- commons/proper/vfs/trunk/src/changes/changes.xml (original)
+++ commons/proper/vfs/trunk/src/changes/changes.xml Wed Nov 2 16:23:32 2011
@@ -23,6 +23,9 @@
+
+Replace custom BZIP2 code with Apache Commons Compress 1.3.
+
Tar error message are missing from resource file.
svn commit: r1196671 - /commons/proper/vfs/trunk/src/changes/changes.xml
Author: ggregory Date: Wed Nov 2 16:25:56 2011 New Revision: 1196671 URL: http://svn.apache.org/viewvc?rev=1196671&view=rev Log: [VFS-378] Tar error message are missing from resource file. Modified: commons/proper/vfs/trunk/src/changes/changes.xml Modified: commons/proper/vfs/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1196671&r1=1196670&r2=1196671&view=diff == --- commons/proper/vfs/trunk/src/changes/changes.xml (original) +++ commons/proper/vfs/trunk/src/changes/changes.xml Wed Nov 2 16:25:56 2011 @@ -26,7 +26,7 @@ Replace custom BZIP2 code with Apache Commons Compress 1.3. - + Tar error message are missing from resource file.
svn commit: r1196673 - /commons/proper/vfs/trunk/pom.xml
Author: ggregory Date: Wed Nov 2 16:27:58 2011 New Revision: 1196673 URL: http://svn.apache.org/viewvc?rev=1196673&view=rev Log: Update maven-checkstyle-plugin to 2.8 from 2.7. Modified: commons/proper/vfs/trunk/pom.xml Modified: commons/proper/vfs/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1196673&r1=1196672&r2=1196673&view=diff == --- commons/proper/vfs/trunk/pom.xml (original) +++ commons/proper/vfs/trunk/pom.xml Wed Nov 2 16:27:58 2011 @@ -149,7 +149,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.7 + 2.8
svn commit: r1196675 - /commons/proper/vfs/trunk/pom.xml
Author: ggregory
Date: Wed Nov 2 16:29:15 2011
New Revision: 1196675
URL: http://svn.apache.org/viewvc?rev=1196675&view=rev
Log:
Update maven-checkstyle-plugin to 2.8 from 2.7.
Modified:
commons/proper/vfs/trunk/pom.xml
Modified: commons/proper/vfs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1196675&r1=1196674&r2=1196675&view=diff
==
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Wed Nov 2 16:29:15 2011
@@ -226,7 +226,7 @@
org.apache.maven.plugins
maven-checkstyle-plugin
-2.7
+2.8
${vfs.parent.dir}/checkstyle.xml
svn commit: r1196677 [2/2] - in /commons/proper/jexl/trunk/src: main/java/org/apache/commons/jexl2/ main/java/org/apache/commons/jexl2/introspection/ main/java/org/apache/commons/jexl2/parser/ main/ja
Modified:
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java?rev=1196677&r1=1196676&r2=1196677&view=diff
==
---
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
(original)
+++
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
Wed Nov 2 16:32:39 2011
@@ -15,6 +15,9 @@
* limitations under the License.
*/
package org.apache.commons.jexl2;
+
+import java.io.StringReader;
+import java.io.StringWriter;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -22,11 +25,13 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
/**
* Test cases for the UnifiedEL.
*/
public class UnifiedJEXLTest extends JexlTestCase {
private static final JexlEngine ENGINE = createEngine(false);
+
static {
ENGINE.setSilent(false);
ENGINE.setCache(128);
@@ -34,13 +39,13 @@ public class UnifiedJEXLTest extends Jex
private static final UnifiedJEXL EL = new UnifiedJEXL(ENGINE);
private static final Log LOG = LogFactory.getLog(UnifiedJEXL.class);
private JexlContext context = null;
-private Map vars =null;
+private Map vars = null;
@Override
public void setUp() throws Exception {
// ensure jul logging is only error
java.util.logging.Logger.getLogger(JexlEngine.class.getName()).setLevel(java.util.logging.Level.SEVERE);
-vars = new HashMap();
+vars = new HashMap();
context = new MapContext(vars);
}
@@ -49,18 +54,38 @@ public class UnifiedJEXLTest extends Jex
debuggerCheck(ENGINE);
super.tearDown();
}
+
+/** Extract the source from a toString-ed expression. */
+private String getSource(String tostring) {
+int len = tostring.length();
+int sc = tostring.lastIndexOf(" /*= ");
+if (sc >= 0) {
+sc += " /*= ".length();
+}
+int ec = tostring.lastIndexOf(" */");
+if (sc >= 0 && ec >= 0 && ec > sc && ec < len) {
+return tostring.substring(sc, ec);
+} else {
+return tostring;
+}
+
+}
public static class Froboz {
int value;
+
public Froboz(int v) {
value = v;
}
+
public void setValue(int v) {
value = v;
}
+
public int getValue() {
return value;
}
+
public int plus10() {
int i = value;
value += 10;
@@ -89,9 +114,10 @@ public class UnifiedJEXLTest extends Jex
o = check.evaluate(context);
assertEquals("Result is not 10", new Integer(10), o);
}
-
+
public void testComposite() throws Exception {
-UnifiedJEXL.Expression expr = EL.parse("Dear ${p} ${name};");
+String source = "Dear ${p} ${name};";
+UnifiedJEXL.Expression expr = EL.parse(source);
vars.put("p", "Mr");
vars.put("name", "Doe");
assertTrue("expression should be immediate", expr.isImmediate());
@@ -101,18 +127,20 @@ public class UnifiedJEXLTest extends Jex
vars.put("name", "Jones");
o = expr.evaluate(context);
assertEquals("Dear Ms Jones;", o);
+assertEquals(source, getSource(expr.toString()));
}
public void testPrepareEvaluate() throws Exception {
+final String source = "Dear #{p} ${name};";
UnifiedJEXL.Expression expr = EL.parse("Dear #{p} ${name};");
assertTrue("expression should be deferred", expr.isDeferred());
-
+
Set> evars = expr.getVariables();
assertEquals(1, evars.size());
assertTrue(evars.contains(Arrays.asList("name")));
vars.put("name", "Doe");
-UnifiedJEXL.Expression phase1 = expr.prepare(context);
-String as = phase1.toString();
+UnifiedJEXL.Expression phase1 = expr.prepare(context);
+String as = phase1.asString();
assertEquals("Dear ${p} Doe;", as);
Set> evars1 = phase1.getVariables();
assertEquals(1, evars1.size());
@@ -121,45 +149,65 @@ public class UnifiedJEXLTest extends Jex
vars.put("name", "Should not be used in 2nd phase");
Object o = phase1.evaluate(context);
assertEquals("Dear Mr Doe;", o);
+
+String p1 = getSource(phase1.toString());
+assertEquals(source, getSource(phase1.toString()));
+assertEquals(source, getSource(expr.toString()));
}
-
+
public void testNested() throws Exception {
-UnifiedJEXL.Expression expr = EL.parse("#{${hi}+'.world'}");
-vars.put("hi", "hello");
-vars.put("hello.world", "Hello World!"
svn commit: r1196694 - /commons/proper/commons-parent/trunk/pom.xml
Author: ggregory
Date: Wed Nov 2 17:04:39 2011
New Revision: 1196694
URL: http://svn.apache.org/viewvc?rev=1196694&view=rev
Log:
Add a profile for running the build using JDK 1.7.
Modified:
commons/proper/commons-parent/trunk/pom.xml
Modified: commons/proper/commons-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1196694&r1=1196693&r2=1196694&view=diff
==
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Wed Nov 2 17:04:39 2011
@@ -805,6 +805,20 @@
+
+
+ java-1.7
+
+true
+
1.7
+
${JAVA_1_7_HOME}/bin/javac
+
${JAVA_1_7_HOME}/bin/java
+
+
+
svn commit: r1196712 - /commons/proper/vfs/trunk/pom.xml
Author: ggregory
Date: Wed Nov 2 17:24:35 2011
New Revision: 1196712
URL: http://svn.apache.org/viewvc?rev=1196712&view=rev
Log:
Update to commons parent 22 from 21.
Follow " -at- " convention for email entry.
Modified:
commons/proper/vfs/trunk/pom.xml
Modified: commons/proper/vfs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1196712&r1=1196711&r2=1196712&view=diff
==
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Wed Nov 2 17:24:35 2011
@@ -22,7 +22,7 @@
org.apache.commons
commons-parent
-21
+22
4.0.0
@@ -98,7 +98,7 @@
Gary D. Gregory
ggregory
- ggreg...@apache.org
+ ggregory -at- apache.org
http://www.garygregory.com
-5
@@ -401,7 +401,8 @@
apache.website
- scp://people.apache.org/www/commons.apache.org/vfs
+ Apache Commons Site
+
${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/${commons.componentid}
svn commit: r1196713 - /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
Author: ggregory
Date: Wed Nov 2 17:26:26 2011
New Revision: 1196713
URL: http://svn.apache.org/viewvc?rev=1196713&view=rev
Log:
Add missing ASL header.
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
(contents, props changed)
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java?rev=1196713&r1=1196712&r2=1196713&view=diff
==
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
Wed Nov 2 17:26:26 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.vfs2.provider.test;
import java.util.Arrays;
@@ -14,6 +30,7 @@ import org.junit.Test;
/**
* Tests FileObject sorting.
+ * $Id$
*/
public class FileObjectSortTestCase {
Propchange:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
--
svn:keywords = Id
svn commit: r1196714 - /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
Author: ggregory
Date: Wed Nov 2 17:26:41 2011
New Revision: 1196714
URL: http://svn.apache.org/viewvc?rev=1196714&view=rev
Log:
Javadoc format.
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java?rev=1196714&r1=1196713&r2=1196714&view=diff
==
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
Wed Nov 2 17:26:41 2011
@@ -30,6 +30,7 @@ import org.junit.Test;
/**
* Tests FileObject sorting.
+ *
* $Id$
*/
public class FileObjectSortTestCase {
svn commit: r1196757 - /commons/proper/vfs/trunk/pom.xml
Author: ggregory Date: Wed Nov 2 18:47:35 2011 New Revision: 1196757 URL: http://svn.apache.org/viewvc?rev=1196757&view=rev Log: Add cobertura report. Modified: commons/proper/vfs/trunk/pom.xml Modified: commons/proper/vfs/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1196757&r1=1196756&r2=1196757&view=diff == --- commons/proper/vfs/trunk/pom.xml (original) +++ commons/proper/vfs/trunk/pom.xml Wed Nov 2 18:47:35 2011 @@ -262,6 +262,11 @@ findbugs-exclude-filter.xml + +org.codehaus.mojo +cobertura-maven-plugin +2.5.1 +
svn commit: r1196786 - /commons/proper/digester/trunk/src/changes/changes.xml
Author: simonetripodi Date: Wed Nov 2 20:16:43 2011 New Revision: 1196786 URL: http://svn.apache.org/viewvc?rev=1196786&view=rev Log: added next release Modified: commons/proper/digester/trunk/src/changes/changes.xml Modified: commons/proper/digester/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/changes/changes.xml?rev=1196786&r1=1196785&r2=1196786&view=diff == --- commons/proper/digester/trunk/src/changes/changes.xml (original) +++ commons/proper/digester/trunk/src/changes/changes.xml Wed Nov 2 20:16:43 2011 @@ -22,6 +22,9 @@ Apache Commons Digester Changes + + + Use Java5 Concurrent APIs to asynchronous parse()
svn commit: r1196830 - /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
Author: ggregory
Date: Wed Nov 2 22:24:35 2011
New Revision: 1196830
URL: http://svn.apache.org/viewvc?rev=1196830&view=rev
Log:
Fix my buggy test.
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java?rev=1196830&r1=1196829&r2=1196830&view=diff
==
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderWriteTests.java
Wed Nov 2 22:24:35 2011
@@ -655,49 +655,50 @@ public class ProviderWriteTests
final FileObject scratchFolder = createScratchFolder();
// Create direct child of the test folder
-final FileObject file = scratchFolder.resolveFile("file1.txt");
-assertTrue(!file.exists());
+final FileObject fileSource = scratchFolder.resolveFile("file1.txt");
+assertTrue(!fileSource.exists());
// Create the source file
-final String content = "Here is some sample content for the file.
Blah Blah Blah.";
-final OutputStream os = file.getContent().getOutputStream();
+final String expectedString = "Here is some sample content for the
file. Blah Blah Blah.";
+final OutputStream expectedOutputStream =
fileSource.getContent().getOutputStream();
try
{
-os.write(content.getBytes("utf-8"));
+expectedOutputStream.write(expectedString.getBytes("utf-8"));
}
finally
{
-os.close();
+expectedOutputStream.close();
}
-assertSameContent(content, file);
+assertSameContent(expectedString, fileSource);
// Make sure we can copy the new file to another file on the same
filesystem
-FileObject fileCopy = scratchFolder.resolveFile("file1copy.txt");
-assertTrue(!fileCopy.exists());
+FileObject fileTarget = scratchFolder.resolveFile("file1copy.txt");
+assertTrue(!fileTarget.exists());
-//fileCopy.copyFrom(file, Selectors.SELECT_SELF);
-//assertSameContent(content, fileCopy);
-final FileContent sourceContent = file.getContent();
+final FileContent contentSource = fileSource.getContent();
//
-sourceContent.write(fileCopy.getContent());
-assertSameContent(content, fileCopy);
+// Tests FileContent#write(FileContent)
+contentSource.write(fileTarget.getContent());
+assertSameContent(expectedString, fileTarget);
//
-OutputStream output = sourceContent.getOutputStream();
+// Tests FileContent#write(OutputStream)
+OutputStream outputStream = fileTarget.getContent().getOutputStream();
try {
-sourceContent.write(output);
-assertSameContent(content, fileCopy);
+contentSource.write(outputStream);
} finally {
-output.close();
+outputStream.close();
}
+assertSameContent(expectedString, fileTarget);
//
-output = sourceContent.getOutputStream();
+// Tests FileContent#write(OutputStream, int)
+outputStream = fileTarget.getContent().getOutputStream();
try {
-sourceContent.write(output, 1234);
-assertSameContent(content, fileCopy);
+contentSource.write(outputStream, 1234);
} finally {
-output.close();
+outputStream.close();
}
+assertSameContent(expectedString, fileTarget);
}
/**
svn commit: r1196842 - /commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
Author: ggregory
Date: Wed Nov 2 22:32:17 2011
New Revision: 1196842
URL: http://svn.apache.org/viewvc?rev=1196842&view=rev
Log:
Use a Java 5 enhanced loop.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java?rev=1196842&r1=1196841&r2=1196842&view=diff
==
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/VFSClassLoader.java
Wed Nov 2 22:32:17 2011
@@ -400,18 +400,14 @@ public class VFSClassLoader extends Secu
*/
private Resource loadResource(final String name) throws FileSystemException
{
-final Iterator it = resources.iterator();
-while (it.hasNext())
+for (FileObject baseFile : resources)
{
-final FileObject baseFile = it.next();
-final FileObject file =
-baseFile.resolveFile(name, NameScope.DESCENDENT_OR_SELF);
+final FileObject file = baseFile.resolveFile(name,
NameScope.DESCENDENT_OR_SELF);
if (file.exists())
{
return new Resource(name, baseFile, file);
}
}
-
return null;
}
}
svn commit: r1196898 - /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java
Author: ggregory
Date: Thu Nov 3 00:55:11 2011
New Revision: 1196898
URL: http://svn.apache.org/viewvc?rev=1196898&view=rev
Log:
Format Javadoc.
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java?rev=1196898&r1=1196897&r2=1196898&view=diff
==
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ftp/test/FtpProviderTestCase.java
Thu Nov 3 00:55:11 2011
@@ -38,6 +38,7 @@ public class FtpProviderTestCase
implements ProviderTestConfig
{
private static final String TEST_URI = "test.ftp.uri";
+
/**
* Creates the test suite for the ftp file system.
*/
svn commit: r1196899 - /commons/proper/vfs/trunk/core/pom.xml
Author: ggregory Date: Thu Nov 3 00:56:21 2011 New Revision: 1196899 URL: http://svn.apache.org/viewvc?rev=1196899&view=rev Log: Format. Modified: commons/proper/vfs/trunk/core/pom.xml Modified: commons/proper/vfs/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/pom.xml?rev=1196899&r1=1196898&r2=1196899&view=diff == --- commons/proper/vfs/trunk/core/pom.xml (original) +++ commons/proper/vfs/trunk/core/pom.xml Thu Nov 3 00:56:21 2011 @@ -49,10 +49,10 @@ commons-net true - - org.apache.commons - commons-compress - + + org.apache.commons + commons-compress + commons-collections commons-collections
svn commit: r1196911 - /commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
Author: ggregory Date: Thu Nov 3 01:19:19 2011 New Revision: 1196911 URL: http://svn.apache.org/viewvc?rev=1196911&view=rev Log: Remove unused import. Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java?rev=1196911&r1=1196910&r2=1196911&view=diff == --- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java (original) +++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java Thu Nov 3 01:19:19 2011 @@ -23,7 +23,6 @@ import java.io.OutputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; import org.apache.commons.vfs2.FileObject; -import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.provider.AbstractFileName; import org.apache.commons.vfs2.provider.compressed.CompressedFileFileObject; import org.apache.commons.vfs2.provider.compressed.CompressedFileFileSystem;
svn commit: r1196935 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java
Author: celestin
Date: Thu Nov 3 04:02:03 2011
New Revision: 1196935
URL: http://svn.apache.org/viewvc?rev=1196935&view=rev
Log:
Fixed Javadoc.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java?rev=1196935&r1=1196934&r2=1196935&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java
Thu Nov 3 04:02:03 2011
@@ -177,9 +177,9 @@ public class UnivariateRealSolverUtils {
* when one of the following happens:
* f(a) * f(b) < 0 -- success!
* a = lower and b = upper
- * -- ConvergenceException
+ * -- NoBracketingException
* Integer.MAX_VALUE iterations elapse
- * -- ConvergenceException
+ * -- NoBracketingException
*
*
* Note: this method can take
@@ -222,9 +222,9 @@ public class UnivariateRealSolverUtils {
* when one of the following happens:
* f(a) * f(b) <= 0 -- success!
* a = lower and b = upper
- * -- ConvergenceException
+ * -- NoBracketingException
* maximumIterations iterations elapse
- * -- ConvergenceException
+ * -- NoBracketingException
*
* @param function Function.
* @param initial Initial midpoint of interval being expanded to
svn commit: r1196950 - in /commons/proper/compress/trunk/src/test: java/org/apache/commons/compress/compressors/XZTestCase.java resources/bla.tar.xz
Author: bodewig
Date: Thu Nov 3 05:53:31 2011
New Revision: 1196950
URL: http://svn.apache.org/viewvc?rev=1196950&view=rev
Log:
Initial test for XZ. COMPRESS-156
Added:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java
- copied, changed from r1196949,
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java
commons/proper/compress/trunk/src/test/resources/bla.tar.xz (with props)
Copied:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java
(from r1196949,
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java)
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java?p2=commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java&p1=commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java&r1=1196949&r2=1196950&rev=1196950&view=diff
==
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java
Thu Nov 3 05:53:31 2011
@@ -30,15 +30,15 @@ import java.io.OutputStream;
import org.apache.commons.compress.AbstractTestCase;
import org.apache.commons.compress.utils.IOUtils;
-public final class GZipTestCase extends AbstractTestCase {
+public final class XZTestCase extends AbstractTestCase {
-public void testGzipCreation() throws Exception {
+public void testXZCreation() throws Exception {
final File input = getFile("test1.xml");
-final File output = new File(dir, "test1.xml.gz");
+final File output = new File(dir, "test1.xml.xz");
final OutputStream out = new FileOutputStream(output);
try {
final CompressorOutputStream cos = new CompressorStreamFactory()
-.createCompressorOutputStream("gz", out);
+.createCompressorOutputStream("xz", out);
try {
IOUtils.copy(new FileInputStream(input), cos);
} finally {
@@ -49,13 +49,13 @@ public final class GZipTestCase extends
}
}
-public void testGzipUnarchive() throws Exception {
-final File input = getFile("bla.tgz");
+public void testXZUnarchive() throws Exception {
+final File input = getFile("bla.tar.xz");
final File output = new File(dir, "bla.tar");
final InputStream is = new FileInputStream(input);
try {
final CompressorInputStream in = new CompressorStreamFactory()
-.createCompressorInputStream("gz", is);
+.createCompressorInputStream("xz", is);
FileOutputStream out = null;
try {
out = new FileOutputStream(output);
@@ -71,43 +71,4 @@ public final class GZipTestCase extends
}
}
-/**
- * @see "https://issues.apache.org/jira/browse/COMPRESS-84";
- */
-public void testCorruptedInput() throws Exception {
-InputStream in = null;
-OutputStream out = null;
-CompressorInputStream cin = null;
-try {
-in = new FileInputStream(getFile("bla.tgz"));
-out = new ByteArrayOutputStream();
-IOUtils.copy(in, out);
-in.close();
-out.close();
-
-byte[] data = ((ByteArrayOutputStream) out).toByteArray();
-in = new ByteArrayInputStream(data, 0, data.length - 1);
-cin = new CompressorStreamFactory()
-.createCompressorInputStream("gz", in);
-out = new ByteArrayOutputStream();
-
-try {
-IOUtils.copy(cin, out);
-fail("Expected an exception");
-} catch (IOException ioex) {
-// the whole point of the test
-}
-
-} finally {
-if (out != null) {
-out.close();
-}
-if (cin != null) {
-cin.close();
-}
-if (in != null) {
-in.close();
-}
-}
-}
}
Added: commons/proper/compress/trunk/src/test/resources/bla.tar.xz
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/resources/bla.tar.xz?rev=1196950&view=auto
==
Binary file - no diff available.
Propchange: commons/proper/compress/trunk/src/test/resources/bla.tar.xz
--
svn:mime-type = application/octet-stream
svn commit: r1196953 - in /commons/proper/compress/trunk/src: main/java/org/apache/commons/compress/compressors/xz/XZUtils.java test/java/org/apache/commons/compress/compressors/XZUtilsTestCase.java
Author: bodewig
Date: Thu Nov 3 06:06:26 2011
New Revision: 1196953
URL: http://svn.apache.org/viewvc?rev=1196953&view=rev
Log:
XZUtils modelled after GzipUtils
Added:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java
- copied, changed from r1196949,
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/XZUtilsTestCase.java
- copied, changed from r1196949,
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/GzipUtilsTestCase.java
Copied:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java
(from r1196949,
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java)
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java?p2=commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java&p1=commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java&r1=1196949&r2=1196953&rev=1196953&view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipUtils.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java
Thu Nov 3 06:06:26 2011
@@ -16,30 +16,31 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.commons.compress.compressors.gzip;
+package org.apache.commons.compress.compressors.xz;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
/**
- * Utility code for the gzip compression format.
+ * Utility code for the xz compression format.
* @ThreadSafe
+ * @since Commons Compress 1.4
*/
-public class GzipUtils {
+public class XZUtils {
/**
- * Map from common filename suffixes to the suffixes that identify gzipped
- * versions of those file types. For example: from ".tar" to ".tgz".
+ * Map from common filename suffixes to the suffixes that identify xzped
+ * versions of those file types. For example: from ".tar" to ".txz".
*/
private static final Map compressSuffix =
new HashMap();
/**
- * Map from common filename suffixes of gzipped files to the corresponding
+ * Map from common filename suffixes of xzped files to the corresponding
* suffixes of uncompressed files. For example: from ".tgz" to ".tar".
*
- * This map also contains gzip-specific suffixes like ".gz" and "-z".
+ * This map also contains xz-specific suffixes like ".gz" and "-z".
* These suffixes are mapped to the empty string, as they should simply
* be removed from the filename when the file is uncompressed.
*/
@@ -47,42 +48,30 @@ public class GzipUtils {
new HashMap();
static {
-compressSuffix.put(".tar", ".tgz");
-compressSuffix.put(".svg", ".svgz");
-compressSuffix.put(".cpio", ".cpgz");
-compressSuffix.put(".wmf", ".wmz");
-compressSuffix.put(".emf", ".emz");
-
-uncompressSuffix.put(".tgz", ".tar");
-uncompressSuffix.put(".taz", ".tar");
-uncompressSuffix.put(".svgz", ".svg");
-uncompressSuffix.put(".cpgz", ".cpio");
-uncompressSuffix.put(".wmz", ".wmf");
-uncompressSuffix.put(".emz", ".emf");
-uncompressSuffix.put(".gz", "");
-uncompressSuffix.put(".z", "");
-uncompressSuffix.put("-gz", "");
-uncompressSuffix.put("-z", "");
-uncompressSuffix.put("_z", "");
+compressSuffix.put(".tar", ".txz");
+
+uncompressSuffix.put(".txz", ".tar");
+uncompressSuffix.put(".xz", "");
+uncompressSuffix.put("-xz", "");
}
// N.B. if any shorter or longer keys are added, ensure the for loop
limits are changed
/** Private constructor to prevent instantiation of this utility class. */
-private GzipUtils() {
+private XZUtils() {
}
/**
- * Detects common gzip suffixes in the given filename.
+ * Detects common xz suffixes in the given filename.
*
* @param filename name of a file
- * @return true if the filename has a common gzip suffix,
+ * @return true if the filename has a common xz suffix,
* false otherwise
*/
public static boolean isCompressedFilename(String filename) {
String lower = filename.toLowerCase(Locale.ENGLISH);
int n = lower.length();
-// Shortest suffix is two letters (_z), longest is five (.svgz)
-for (int i = 2; i <= 5 && i < n; i++) {
+// Shortest suffix is three letters (.xz), longest is
svn commit: r1196969 - in /commons/proper/compress/trunk: pom.xml src/changes/changes.xml src/main/java/org/apache/commons/compress/compressors/xz/package.html src/site/xdoc/examples.xml src/site/xdoc
Author: bodewig
Date: Thu Nov 3 06:32:25 2011
New Revision: 1196969
URL: http://svn.apache.org/viewvc?rev=1196969&view=rev
Log:
documentation for XZ
Added:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/package.html
- copied, changed from r1196949,
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/package.html
Modified:
commons/proper/compress/trunk/pom.xml
commons/proper/compress/trunk/src/changes/changes.xml
commons/proper/compress/trunk/src/site/xdoc/examples.xml
commons/proper/compress/trunk/src/site/xdoc/index.xml
Modified: commons/proper/compress/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/pom.xml?rev=1196969&r1=1196968&r2=1196969&view=diff
==
--- commons/proper/compress/trunk/pom.xml (original)
+++ commons/proper/compress/trunk/pom.xml Thu Nov 3 06:32:25 2011
@@ -102,6 +102,10 @@
Michael Kuss
mail at michael minus kuss.de
+
+ Lasse Collin
+ lasse.col...@tukaani.org
+
Modified: commons/proper/compress/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/changes/changes.xml?rev=1196969&r1=1196968&r2=1196969&view=diff
==
--- commons/proper/compress/trunk/src/changes/changes.xml (original)
+++ commons/proper/compress/trunk/src/changes/changes.xml Thu Nov 3 06:32:25
2011
@@ -46,6 +46,9 @@ The type attribute can be add,u
+
+Support for the XZ format has been added.
+
Copied:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/package.html
(from r1196949,
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/package.html)
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/package.html?p2=commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/package.html&p1=commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/package.html&r1=1196949&r2=1196969&rev=1196969&view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/package.html
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/package.html
Thu Nov 3 06:32:25 2011
@@ -19,11 +19,13 @@
-->
Provides stream classes for compressing and decompressing
- streams using the GZip algorithm.
+ streams using the XZ algorithm.
The classes in this package are wrappers around {@link
- java.util.zip.GZIPInputStream java.util.zip.GZIPInputStream} and
- {@link java.util.zip.GZIPOutputStream
- java.util.zip.GZIPOutputStream}.
+ org.tukaani.xz.XZInputStream org.tukaani.xz.XZInputStream} and
+ {@link org.tukaani.xz.XZOutputStream
+ org.tukaani.xz.XZOutputStream} provided by the public
+ domain http://tukaani.org/xz/java.html";>XZ for Java
+ library.
Modified: commons/proper/compress/trunk/src/site/xdoc/examples.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/site/xdoc/examples.xml?rev=1196969&r1=1196968&r2=1196969&view=diff
==
--- commons/proper/compress/trunk/src/site/xdoc/examples.xml (original)
+++ commons/proper/compress/trunk/src/site/xdoc/examples.xml Thu Nov 3
06:32:25 2011
@@ -380,6 +380,30 @@ pIn.close();
]]>
+
+
+The implementation of this package is provided by the
+ public domain http://tukaani.org/xz/java.html";>XZ
+ for Java library.
+
+Uncompressing a given XZ compressed file (you would
+ certainly add exception handling and make sure all streams
+ get closed properly):
+
+
+
Modified: commons/proper/compress/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/site/xdoc/index.xml?rev=1196969&r1=1196968&r2=1196969&view=diff
==
--- commons/proper/compress/trunk/src/site/xdoc/index.xml (original)
+++ commons/proper/compress/trunk/src/site/xdoc/index.xml Thu Nov 3 06:32:25
2011
@@ -26,7 +26,7 @@
The Apache Commons Compress library defines an API for
-working with ar, cpio, Unix dump, tar, zip, gzip, Pack200 and
bzip2 files.
+working with ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200
and bzip2 files.
The code in this component has many origins:
@@ -61
svn commit: r1196970 - /commons/proper/compress/trunk/pom.xml
Author: bodewig Date: Thu Nov 3 06:33:06 2011 New Revision: 1196970 URL: http://svn.apache.org/viewvc?rev=1196970&view=rev Log: Christian has an ASF id Modified: commons/proper/compress/trunk/pom.xml Modified: commons/proper/compress/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/pom.xml?rev=1196970&r1=1196969&r2=1196970&view=diff == --- commons/proper/compress/trunk/pom.xml (original) +++ commons/proper/compress/trunk/pom.xml Thu Nov 3 06:33:06 2011 @@ -81,6 +81,7 @@ Christian Grobmeier + grobmeier grobmeier at apache.org
