Author: jochen
Date: Mon Jul 2 13:47:10 2007
New Revision: 552590
URL: http://svn.apache.org/viewvc?view=rev&rev=552590
Log:
Merged in changes from 1.3 branch.
Added:
jakarta/commons/proper/io/trunk/xdocs/upgradeto1_3_2.xml
Modified:
jakarta/commons/proper/io/trunk/pom.xml
jakarta/commons/proper/io/trunk/src/changes/changes.xml
jakarta/commons/proper/io/trunk/src/conf/MANIFEST.MF
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileCleaningTracker.java
jakarta/commons/proper/io/trunk/xdocs/building.xml
jakarta/commons/proper/io/trunk/xdocs/index.xml
jakarta/commons/proper/io/trunk/xdocs/navigation.xml
Modified: jakarta/commons/proper/io/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/pom.xml?view=diff&rev=552590&r1=552589&r2=552590
==============================================================================
--- jakarta/commons/proper/io/trunk/pom.xml (original)
+++ jakarta/commons/proper/io/trunk/pom.xml Mon Jul 2 13:47:10 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>2</version>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-io</groupId>
@@ -253,4 +253,101 @@
</plugin>
</plugins>
</reporting>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.directory}/site/api-release">
+ <fileset dir="${project.build.directory}/site/apidocs"/>
+ </copy>
+ <zip
destfile="${project.build.directory}/${artifactId}-${version}-javadoc.jar.new">
+ <zipfileset
src="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
+ <zipfileset dir="." prefix="META-INF">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </zipfileset>
+ </zip>
+ <move
file="${project.build.directory}/${artifactId}-${version}-javadoc.jar.new"
+
tofile="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
+ <zip
destfile="${project.build.directory}/${artifactId}-${version}-sources.jar.new">
+ <zipfileset
src="${project.build.directory}/${artifactId}-${version}-sources.jar"/>
+ <zipfileset dir="." prefix="META-INF">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </zipfileset>
+ </zip>
+ <move
file="${project.build.directory}/${artifactId}-${version}-sources.jar.new"
+
tofile="${project.build.directory}/${artifactId}-${version}-sources.jar"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>rc</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: jakarta/commons/proper/io/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/src/changes/changes.xml?view=diff&rev=552590&r1=552589&r2=552590
==============================================================================
--- jakarta/commons/proper/io/trunk/src/changes/changes.xml (original)
+++ jakarta/commons/proper/io/trunk/src/changes/changes.xml Mon Jul 2 13:47:10
2007
@@ -40,6 +40,9 @@
<body>
<release version="1.4" date="Not yet released">
+ </release>
+
+ <release version="1.3.2" date="2007-Jul-02">
<action dev="jochen" type="fix" issue="IO-115">
Some tests, which are implicitly assuming a Unix-like file
system, are now skipped on Windows.
Modified: jakarta/commons/proper/io/trunk/src/conf/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/src/conf/MANIFEST.MF?view=diff&rev=552590&r1=552589&r2=552590
==============================================================================
--- jakarta/commons/proper/io/trunk/src/conf/MANIFEST.MF (original)
+++ jakarta/commons/proper/io/trunk/src/conf/MANIFEST.MF Mon Jul 2 13:47:10
2007
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Package: org.apache.commons.io
Extension-Name: commons-io
-Specification-Version: 1.3.1
+Specification-Version: 1.4-SNAPSHOT
Specification-Vendor: Apache Software Foundation
Specification-Title: Commons IO
-Implementation-Version: 1.3.1
+Implementation-Version: 1.4-SNAPSHOT
Implementation-Vendor: Apache Software Foundation
Implementation-Title: Commons IO
Implementation-Vendor-Id: org.apache
Modified:
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileCleaningTracker.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileCleaningTracker.java?view=diff&rev=552590&r1=552589&r2=552590
==============================================================================
---
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileCleaningTracker.java
(original)
+++
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileCleaningTracker.java
Mon Jul 2 13:47:10 2007
@@ -17,8 +17,6 @@
package org.apache.commons.io;
import java.io.File;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
import java.lang.ref.PhantomReference;
import java.lang.ref.ReferenceQueue;
import java.util.Collection;
@@ -42,28 +40,23 @@
* @author Martin Cooper
* @version $Id: FileCleaner.java 490987 2006-12-29 12:11:48Z scolebourne $
*/
-public class FileCleaningTracker implements Serializable {
- /**
- * UID for serializing instances of this class.
- */
- private static final long serialVersionUID = -8153509976492548871L;
-
+public class FileCleaningTracker {
/**
* Queue of <code>Tracker</code> instances being watched.
*/
- transient ReferenceQueue /* Tracker */ q = new ReferenceQueue();
+ ReferenceQueue /* Tracker */ q = new ReferenceQueue();
/**
* Collection of <code>Tracker</code> instances in existence.
*/
- final transient Collection /* Tracker */ trackers = new Vector(); //
synchronized
+ final Collection /* Tracker */ trackers = new Vector(); // synchronized
/**
* Whether to terminate the thread when the tracking is complete.
*/
- transient volatile boolean exitWhenFinished = false;
+ volatile boolean exitWhenFinished = false;
/**
* The thread that will clean up registered files.
*/
- transient Thread reaper;
+ Thread reaper;
//-----------------------------------------------------------------------
/**
@@ -262,14 +255,4 @@
}
}
- /**
- * This method is called when an instance is deserialized.
- * It replaces the deserialized instance with a new, fresh
- * instance.
- * @return A new instance, which hasn't been in use so far.
- * @throws ObjectStreamException Not actually thrown.
- */
- private Object readResolve() throws ObjectStreamException {
- return new FileCleaningTracker();
- }
}
Modified: jakarta/commons/proper/io/trunk/xdocs/building.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/xdocs/building.xml?view=diff&rev=552590&r1=552589&r2=552590
==============================================================================
--- jakarta/commons/proper/io/trunk/xdocs/building.xml (original)
+++ jakarta/commons/proper/io/trunk/xdocs/building.xml Mon Jul 2 13:47:10 2007
@@ -29,6 +29,7 @@
</p>
<p>
You may also be interested in the upgrade notes:<br />
+ Upgrade <a href="upgradeto1_3_2.html">from 1.3, or 1.3.1 to 1.3.2</a><br />
Upgrade <a href="upgradeto1_3_1.html">from 1.3 to 1.3.1</a><br />
Upgrade <a href="upgradeto1_3.html">from 1.2 to 1.3</a><br />
Upgrade <a href="upgradeto1_2.html">from 1.1 to 1.2</a><br />
Modified: jakarta/commons/proper/io/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/xdocs/index.xml?view=diff&rev=552590&r1=552589&r2=552590
==============================================================================
--- jakarta/commons/proper/io/trunk/xdocs/index.xml (original)
+++ jakarta/commons/proper/io/trunk/xdocs/index.xml Mon Jul 2 13:47:10 2007
@@ -40,13 +40,14 @@
<p>
A getting started <a href="description.html">user guide</a> is available,
as are some IO <a href="bestpractices.html">best practices</a>
-and various <a href="maven-reports.html">project reports</a>.
+and various <a href="project-reports.html">project reports</a>.
</p>
<p>
The JavaDoc API documents are available online:
</p>
<ul>
-<li>The <a href="api-release/index.html">current release 1.3.1</a></li>
+<li>The <a href="api-release/index.html">current release 1.3.2</a></li>
+<li>The <a href="api-1.3.1/index.html">previous version 1.3.1</a></li>
<li>The <a href="api-1.3/index.html">previous version 1.3</a></li>
<li>The <a href="api-1.2/index.html">previous version 1.2</a></li>
<li>The <a href="api-1.1/index.html">previous version 1.1</a></li>
@@ -60,9 +61,9 @@
<!-- ================================================== -->
<section name="Releases">
<p>
-The latest version is v1.3.1. -
+The latest version is v1.3.2. -
<a
href="http://jakarta.apache.org/site/downloads/downloads_commons-io.cgi";>Download
now!</a><br />
-The <a href="upgradeto1_3_1.html">upgrade notes</a> are also available.
+The <a href="upgradeto1_3_2.html">upgrade notes</a> are also available.
</p>
<p>
Modified: jakarta/commons/proper/io/trunk/xdocs/navigation.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/xdocs/navigation.xml?view=diff&rev=552590&r1=552589&r2=552590
==============================================================================
--- jakarta/commons/proper/io/trunk/xdocs/navigation.xml (original)
+++ jakarta/commons/proper/io/trunk/xdocs/navigation.xml Mon Jul 2 13:47:10
2007
@@ -31,7 +31,7 @@
<item name="User guide" href="/description.html"/>
<item name="Best practices" href="/bestpractices.html"/>
<!--item name="History" href="/history.html"/-->
- <item name="Javadoc (1.3.1 release)" href="api-release/index.html"/>
+ <item name="Javadoc (1.3.2 release)" href="api-release/index.html"/>
</menu>
<menu name="Development">
Added: jakarta/commons/proper/io/trunk/xdocs/upgradeto1_3_2.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/xdocs/upgradeto1_3_2.xml?view=auto&rev=552590
==============================================================================
--- jakarta/commons/proper/io/trunk/xdocs/upgradeto1_3_2.xml (added)
+++ jakarta/commons/proper/io/trunk/xdocs/upgradeto1_3_2.xml Mon Jul 2
13:47:10 2007
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<!--
+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.
+-->
+<document>
+ <properties>
+ <title>Upgrade from 1.3, or 1.3.1, to 1.3.2</title>
+ <author email="commons-dev@jakarta.apache.org">Commons Documentation
Team</author>
+ </properties>
+<body>
+
+<section name="Upgrade">
+<p>
+These are the release notes and advice for upgrading Commons-IO from
+version 1.3, or 1.3.1, to version 1.3.2.
+<source>
+Commons IO is a package of Java utility classes for java.io's hierarchy.
+Classes in this package are considered to be so standard and of such high
+reuse as to justify existence in java.io.
+
+Commons IO contains utility classes, stream implementations, file filters,
+and endian transformation classes.
+
+
+Compatibility with 1.3.1
+------------------------
+Binary compatible - Yes
+
+Source compatible - Yes
+
+Semantic compatible - Yes
+ Check the bug fixes section for semantic bug fixes
+
+
+Compatibility with 1.3
+----------------------
+Binary compatible - No
+ See [IO-113]
+
+Source compatible - No
+ See [IO-113]
+
+Semantic compatible - Yes
+
+
+Enhancements since 1.3.1
+------------------------
+
+- Created the FileCleaningTracker, basically a non-static version of the
+ FileCleaner, which can be controlled by the user. [IO-116]
+- The FileCleaner is deprecated. (For reasons of compatibility, the
+ deprecation warnings are hidden within the 1.3 branch. They'll be
+ visible, as of version 1.4.)
+
+
+Bug fixes from 1.3.1
+--------------------
+
+- Some tests, which are implicitly assuming a Unix-like file system, are
+ now skipped on Windows. [IO-115]
+
+
+Bug fixes from 1.3
+------------------
+
+- FileUtils
+ - NPE in openOutputStream(File) when file has no parent in path [IO-112]
+ - readFileToString(File) is not static [IO-113]
+</source>
+</p>
+</section>
+
+</body>
+</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
