Skip to content

Commit 186225b

Browse files
jochenwjochenw
committed
Merged in changes from 1.3 branch.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@552590 13f79535-47bb-0310-9956-ffa450edef68
1 parent c6b82c0 commit 186225b

8 files changed

Lines changed: 202 additions & 30 deletions

File tree

‎pom.xml‎

Lines changed: 98 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.commons</groupId>
2424
<artifactId>commons-parent</artifactId>
25-
<version>2</version>
25+
<version>3</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828
<groupId>commons-io</groupId>
@@ -253,4 +253,101 @@
253253
</plugin>
254254
</plugins>
255255
</reporting>
256+
257+
<profiles>
258+
<profile>
259+
<id>release</id>
260+
<build>
261+
<plugins>
262+
<plugin>
263+
<artifactId>maven-site-plugin</artifactId>
264+
<executions>
265+
<execution>
266+
<goals>
267+
<goal>site</goal>
268+
</goals>
269+
<phase>package</phase>
270+
</execution>
271+
</executions>
272+
</plugin>
273+
<plugin>
274+
<artifactId>maven-antrun-plugin</artifactId>
275+
<executions>
276+
<execution>
277+
<goals>
278+
<goal>run</goal>
279+
</goals>
280+
<phase>package</phase>
281+
<configuration>
282+
<tasks>
283+
<copy todir="${project.build.directory}/site/api-release">
284+
<fileset dir="${project.build.directory}/site/apidocs"/>
285+
</copy>
286+
<zip destfile="${project.build.directory}/${artifactId}-${version}-javadoc.jar.new">
287+
<zipfileset src="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
288+
<zipfileset dir="." prefix="META-INF">
289+
<include name="LICENSE.txt"/>
290+
<include name="NOTICE.txt"/>
291+
</zipfileset>
292+
</zip>
293+
<move file="${project.build.directory}/${artifactId}-${version}-javadoc.jar.new"
294+
tofile="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
295+
<zip destfile="${project.build.directory}/${artifactId}-${version}-sources.jar.new">
296+
<zipfileset src="${project.build.directory}/${artifactId}-${version}-sources.jar"/>
297+
<zipfileset dir="." prefix="META-INF">
298+
<include name="LICENSE.txt"/>
299+
<include name="NOTICE.txt"/>
300+
</zipfileset>
301+
</zip>
302+
<move file="${project.build.directory}/${artifactId}-${version}-sources.jar.new"
303+
tofile="${project.build.directory}/${artifactId}-${version}-sources.jar"/>
304+
</tasks>
305+
</configuration>
306+
</execution>
307+
</executions>
308+
</plugin>
309+
<plugin>
310+
<artifactId>maven-assembly-plugin</artifactId>
311+
<executions>
312+
<execution>
313+
<goals>
314+
<goal>attached</goal>
315+
</goals>
316+
<phase>package</phase>
317+
</execution>
318+
</executions>
319+
</plugin>
320+
</plugins>
321+
</build>
322+
</profile>
323+
<profile>
324+
<id>rc</id>
325+
<build>
326+
<plugins>
327+
<plugin>
328+
<artifactId>maven-site-plugin</artifactId>
329+
<executions>
330+
<execution>
331+
<goals>
332+
<goal>site</goal>
333+
</goals>
334+
<phase>package</phase>
335+
</execution>
336+
</executions>
337+
</plugin>
338+
<plugin>
339+
<artifactId>maven-assembly-plugin</artifactId>
340+
<executions>
341+
<execution>
342+
<goals>
343+
<goal>attached</goal>
344+
</goals>
345+
<phase>package</phase>
346+
</execution>
347+
</executions>
348+
</plugin>
349+
</plugins>
350+
</build>
351+
</profile>
352+
</profiles>
256353
</project>

‎src/changes/changes.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ The <action> type attribute can be add,update,fix,remove.
4040

4141
<body>
4242
<release version="1.4" date="Not yet released">
43+
</release>
44+
45+
<release version="1.3.2" date="2007-Jul-02">
4346
<action dev="jochen" type="fix" issue="IO-115">
4447
Some tests, which are implicitly assuming a Unix-like file
4548
system, are now skipped on Windows.

‎src/conf/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Manifest-Version: 1.0
22
Package: org.apache.commons.io
33
Extension-Name: commons-io
4-
Specification-Version: 1.3.1
4+
Specification-Version: 1.4-SNAPSHOT
55
Specification-Vendor: Apache Software Foundation
66
Specification-Title: Commons IO
7-
Implementation-Version: 1.3.1
7+
Implementation-Version: 1.4-SNAPSHOT
88
Implementation-Vendor: Apache Software Foundation
99
Implementation-Title: Commons IO
1010
Implementation-Vendor-Id: org.apache

‎src/java/org/apache/commons/io/FileCleaningTracker.java‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
package org.apache.commons.io;
1818

1919
import java.io.File;
20-
import java.io.ObjectStreamException;
21-
import java.io.Serializable;
2220
import java.lang.ref.PhantomReference;
2321
import java.lang.ref.ReferenceQueue;
2422
import java.util.Collection;
@@ -42,28 +40,23 @@
4240
* @author Martin Cooper
4341
* @version $Id: FileCleaner.java 490987 2006-12-29 12:11:48Z scolebourne $
4442
*/
45-
public class FileCleaningTracker implements Serializable {
46-
/**
47-
* UID for serializing instances of this class.
48-
*/
49-
private static final long serialVersionUID = -8153509976492548871L;
50-
43+
public class FileCleaningTracker {
5144
/**
5245
* Queue of <code>Tracker</code> instances being watched.
5346
*/
54-
transient ReferenceQueue /* Tracker */ q = new ReferenceQueue();
47+
ReferenceQueue /* Tracker */ q = new ReferenceQueue();
5548
/**
5649
* Collection of <code>Tracker</code> instances in existence.
5750
*/
58-
final transient Collection /* Tracker */ trackers = new Vector(); // synchronized
51+
final Collection /* Tracker */ trackers = new Vector(); // synchronized
5952
/**
6053
* Whether to terminate the thread when the tracking is complete.
6154
*/
62-
transient volatile boolean exitWhenFinished = false;
55+
volatile boolean exitWhenFinished = false;
6356
/**
6457
* The thread that will clean up registered files.
6558
*/
66-
transient Thread reaper;
59+
Thread reaper;
6760

6861
//-----------------------------------------------------------------------
6962
/**
@@ -262,14 +255,4 @@ public boolean delete() {
262255
}
263256
}
264257

265-
/**
266-
* This method is called when an instance is deserialized.
267-
* It replaces the deserialized instance with a new, fresh
268-
* instance.
269-
* @return A new instance, which hasn't been in use so far.
270-
* @throws ObjectStreamException Not actually thrown.
271-
*/
272-
private Object readResolve() throws ObjectStreamException {
273-
return new FileCleaningTracker();
274-
}
275258
}

‎xdocs/building.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ limitations under the License.
2929
</p>
3030
<p>
3131
You may also be interested in the upgrade notes:<br />
32+
Upgrade <a href="upgradeto1_3_2.html">from 1.3, or 1.3.1 to 1.3.2</a><br />
3233
Upgrade <a href="upgradeto1_3_1.html">from 1.3 to 1.3.1</a><br />
3334
Upgrade <a href="upgradeto1_3.html">from 1.2 to 1.3</a><br />
3435
Upgrade <a href="upgradeto1_2.html">from 1.1 to 1.2</a><br />

‎xdocs/index.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@ There are three main areas included:
4040
<p>
4141
A getting started <a href="description.html">user guide</a> is available,
4242
as are some IO <a href="bestpractices.html">best practices</a>
43-
and various <a href="maven-reports.html">project reports</a>.
43+
and various <a href="project-reports.html">project reports</a>.
4444
</p>
4545
<p>
4646
The JavaDoc API documents are available online:
4747
</p>
4848
<ul>
49-
<li>The <a href="api-release/index.html">current release 1.3.1</a></li>
49+
<li>The <a href="api-release/index.html">current release 1.3.2</a></li>
50+
<li>The <a href="api-1.3.1/index.html">previous version 1.3.1</a></li>
5051
<li>The <a href="api-1.3/index.html">previous version 1.3</a></li>
5152
<li>The <a href="api-1.2/index.html">previous version 1.2</a></li>
5253
<li>The <a href="api-1.1/index.html">previous version 1.1</a></li>
@@ -60,9 +61,9 @@ The <a href="cvs-usage.html">subversion repository</a> can be
6061
<!-- ================================================== -->
6162
<section name="Releases">
6263
<p>
63-
The latest version is v1.3.1. -
64+
The latest version is v1.3.2. -
6465
<a href="http://jakarta.apache.org/site/downloads/downloads_commons-io.cgi">Download now!</a><br />
65-
The <a href="upgradeto1_3_1.html">upgrade notes</a> are also available.
66+
The <a href="upgradeto1_3_2.html">upgrade notes</a> are also available.
6667

6768
</p>
6869
<p>

‎xdocs/navigation.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ limitations under the License.
3131
<item name="User guide" href="/description.html"/>
3232
<item name="Best practices" href="/bestpractices.html"/>
3333
<!--item name="History" href="/history.html"/-->
34-
<item name="Javadoc (1.3.1 release)" href="api-release/index.html"/>
34+
<item name="Javadoc (1.3.2 release)" href="api-release/index.html"/>
3535
</menu>
3636

3737
<menu name="Development">

‎xdocs/upgradeto1_3_2.xml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one or more
4+
contributor license agreements. See the NOTICE file distributed with
5+
this work for additional information regarding copyright ownership.
6+
The ASF licenses this file to You under the Apache License, Version 2.0
7+
(the "License"); you may not use this file except in compliance with
8+
the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<document>
19+
<properties>
20+
<title>Upgrade from 1.3, or 1.3.1, to 1.3.2</title>
21+
<author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
22+
</properties>
23+
<body>
24+
25+
<section name="Upgrade">
26+
<p>
27+
These are the release notes and advice for upgrading Commons-IO from
28+
version 1.3, or 1.3.1, to version 1.3.2.
29+
<source>
30+
Commons IO is a package of Java utility classes for java.io's hierarchy.
31+
Classes in this package are considered to be so standard and of such high
32+
reuse as to justify existence in java.io.
33+
34+
Commons IO contains utility classes, stream implementations, file filters,
35+
and endian transformation classes.
36+
37+
38+
Compatibility with 1.3.1
39+
------------------------
40+
Binary compatible - Yes
41+
42+
Source compatible - Yes
43+
44+
Semantic compatible - Yes
45+
Check the bug fixes section for semantic bug fixes
46+
47+
48+
Compatibility with 1.3
49+
----------------------
50+
Binary compatible - No
51+
See [IO-113]
52+
53+
Source compatible - No
54+
See [IO-113]
55+
56+
Semantic compatible - Yes
57+
58+
59+
Enhancements since 1.3.1
60+
------------------------
61+
62+
- Created the FileCleaningTracker, basically a non-static version of the
63+
FileCleaner, which can be controlled by the user. [IO-116]
64+
- The FileCleaner is deprecated. (For reasons of compatibility, the
65+
deprecation warnings are hidden within the 1.3 branch. They'll be
66+
visible, as of version 1.4.)
67+
68+
69+
Bug fixes from 1.3.1
70+
--------------------
71+
72+
- Some tests, which are implicitly assuming a Unix-like file system, are
73+
now skipped on Windows. [IO-115]
74+
75+
76+
Bug fixes from 1.3
77+
------------------
78+
79+
- FileUtils
80+
- NPE in openOutputStream(File) when file has no parent in path [IO-112]
81+
- readFileToString(File) is not static [IO-113]
82+
</source>
83+
</p>
84+
</section>
85+
86+
</body>
87+
</document>

0 commit comments

Comments
 (0)