svn commit: r635215 - in /commons/proper/commons-parent/tags/commons-parent-9: ./ pom.xml
Author: niallp Date: Sun Mar 9 03:45:58 2008 New Revision: 635215 URL: http://svn.apache.org/viewvc?rev=635215&view=rev Log: [maven-release-plugin] copy for tag commons-parent-9 Added: commons/proper/commons-parent/tags/commons-parent-9/ - copied from r635213, commons/proper/commons-parent/trunk/ commons/proper/commons-parent/tags/commons-parent-9/pom.xml - copied unchanged from r635214, commons/proper/commons-parent/trunk/pom.xml
svn commit: r635216 - /commons/proper/commons-parent/trunk/pom.xml
Author: niallp Date: Sun Mar 9 03:46:02 2008 New Revision: 635216 URL: http://svn.apache.org/viewvc?rev=635216&view=rev Log: [maven-release-plugin] prepare for next development iteration 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=635216&r1=635215&r2=635216&view=diff == --- commons/proper/commons-parent/trunk/pom.xml (original) +++ commons/proper/commons-parent/trunk/pom.xml Sun Mar 9 03:46:02 2008 @@ -9,7 +9,7 @@ commons-parent pom - 9 + 10-SNAPSHOT Commons Parent http://commons.apache.org/ 2001 @@ -46,9 +46,9 @@ a release of the commons-parent POM. --> - scm:svn:http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-9 - scm:svn:https://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-9 - http://svn.apache.org/viewvc/commons/proper/commons-parent/tags/commons-parent-9 + scm:svn:http://svn.apache.org/repos/asf/commons/proper/commons-parent/trunk + scm:svn:https://svn.apache.org/repos/asf/commons/proper/commons-parent/trunk +http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk
svn commit: r635214 - /commons/proper/commons-parent/trunk/pom.xml
Author: niallp
Date: Sun Mar 9 03:45:50 2008
New Revision: 635214
URL: http://svn.apache.org/viewvc?rev=635214&view=rev
Log:
[maven-release-plugin] prepare release commons-parent-9
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=635214&r1=635213&r2=635214&view=diff
==
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Sun Mar 9 03:45:50 2008
@@ -1,22 +1,3 @@
-
-
http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
@@ -28,7 +9,7 @@
commons-parent
pom
- 9-SNAPSHOT
+ 9
Commons Parent
http://commons.apache.org/
2001
@@ -65,9 +46,9 @@
a release of the commons-parent POM.
-->
-
scm:svn:http://svn.apache.org/repos/asf/commons/proper/commons-parent/trunk
-
scm:svn:https://svn.apache.org/repos/asf/commons/proper/commons-parent/trunk
-http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk
+
scm:svn:http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-9
+
scm:svn:https://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-9
+
http://svn.apache.org/viewvc/commons/proper/commons-parent/tags/commons-parent-9
@@ -561,8 +542,8 @@
org.apache.commons.${commons.componentid}
org.apache.commons.*;version=${pom.version}
*
-
-
+
+
target/osgi/MANIFEST.MF
@@ -583,4 +564,4 @@
-
+
\ No newline at end of file
svn commit: r635220 - in /commons/proper/codec/trunk: pom.xml project.properties
Author: niallp Date: Sun Mar 9 04:42:22 2008 New Revision: 635220 URL: http://svn.apache.org/viewvc?rev=635220&view=rev Log: Specify JDK 1.4 target on m1 build and add source/target options of 1.4 to m2 build Modified: commons/proper/codec/trunk/pom.xml commons/proper/codec/trunk/project.properties Modified: commons/proper/codec/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=635220&r1=635219&r2=635220&view=diff == --- commons/proper/codec/trunk/pom.xml (original) +++ commons/proper/codec/trunk/pom.xml Sun Mar 9 04:42:22 2008 @@ -157,6 +157,8 @@ +1.4 +1.4 codec 1.3 Modified: commons/proper/codec/trunk/project.properties URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/project.properties?rev=635220&r1=635219&r2=635220&view=diff == --- commons/proper/codec/trunk/project.properties (original) +++ commons/proper/codec/trunk/project.properties Sun Mar 9 04:42:22 2008 @@ -60,6 +60,7 @@ # Corresponds to the source attribute for the ant javac task. # Valid values are 1.3, 1.4, 1.5. maven.compile.source = 1.4 +maven.compile.target = 1.4 # See https://svn.apache.org/repos/private/committers/donated-licenses/clover/README.txt maven.jar.override=on
svn commit: r635222 - /commons/proper/codec/trunk/pom.xml
Author: niallp
Date: Sun Mar 9 04:44:46 2008
New Revision: 635222
URL: http://svn.apache.org/viewvc?rev=635222&view=rev
Log:
Specify report plugin versions and add cobertura, pmd and findbugs reports (as
per m1 build)
Modified:
commons/proper/codec/trunk/pom.xml
Modified: commons/proper/codec/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=635222&r1=635221&r2=635222&view=diff
==
--- commons/proper/codec/trunk/pom.xml (original)
+++ commons/proper/codec/trunk/pom.xml Sun Mar 9 04:44:46 2008
@@ -201,6 +201,7 @@
org.apache.maven.plugins
maven-changes-plugin
+ 2.0-beta-3
${basedir}/xdocs/changes.xml
%URL%/%ISSUE%
@@ -216,10 +217,26 @@
org.apache.maven.plugins
maven-checkstyle-plugin
+ 2.1
checkstyle.xml
false
+
+
+ org.codehaus.mojo
+ cobertura-maven-plugin
+ 2.2
+
+
+ org.apache.maven.plugins
+ maven-pmd-plugin
+ 2.3
+
+
+ org.codehaus.mojo
+ findbugs-maven-plugin
+ 1.1.1
svn commit: r635227 - /commons/proper/codec/trunk/pom.xml
Author: niallp Date: Sun Mar 9 05:08:25 2008 New Revision: 635227 URL: http://svn.apache.org/viewvc?rev=635227&view=rev Log: Add clirr report Modified: commons/proper/codec/trunk/pom.xml Modified: commons/proper/codec/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=635227&r1=635226&r2=635227&view=diff == --- commons/proper/codec/trunk/pom.xml (original) +++ commons/proper/codec/trunk/pom.xml Sun Mar 9 05:08:25 2008 @@ -238,6 +238,15 @@ findbugs-maven-plugin 1.1.1 + + org.codehaus.mojo + clirr-maven-plugin + 2.1 + +1.3 +info + +
svn commit: r635238 - /commons/proper/net/branches/NET_2_0/src/site/xdoc/download.xml
Author: rwinston Date: Sun Mar 9 07:02:11 2008 New Revision: 635238 URL: http://svn.apache.org/viewvc?rev=635238&view=rev Log: update download.xml Modified: commons/proper/net/branches/NET_2_0/src/site/xdoc/download.xml Modified: commons/proper/net/branches/NET_2_0/src/site/xdoc/download.xml URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/site/xdoc/download.xml?rev=635238&r1=635237&r2=635238&view=diff == --- commons/proper/net/branches/NET_2_0/src/site/xdoc/download.xml (original) +++ commons/proper/net/branches/NET_2_0/src/site/xdoc/download.xml Sun Mar 9 07:02:11 2008 @@ -26,7 +26,7 @@ -You can download http://jakarta.apache.org/site/downloads/downloads_commons-net.cgi";>binary or http://jakarta.apache.org/site/downloads/downloads_commons-net.cgi";>source production releases. +You can download http://commons.apache.org/downloads/download_net.cgi";>binary or http://commons.apache.org/downloads/download_net.cgi";>source production releases.
svn commit: r635245 - /commons/proper/net/branches/NET_2_0/pom.xml
Author: niallp Date: Sun Mar 9 07:22:15 2008 New Revision: 635245 URL: http://svn.apache.org/viewvc?rev=635245&view=rev Log: Upgrade to version 9 of commons-parent Modified: commons/proper/net/branches/NET_2_0/pom.xml Modified: commons/proper/net/branches/NET_2_0/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/pom.xml?rev=635245&r1=635244&r2=635245&view=diff == --- commons/proper/net/branches/NET_2_0/pom.xml (original) +++ commons/proper/net/branches/NET_2_0/pom.xml Sun Mar 9 07:22:15 2008 @@ -22,10 +22,9 @@ org.apache.commons commons-parent -8 +9 4.0.0 -bundle commons-net commons-net 2.0.0-SNAPSHOT
svn commit: r635244 - in /commons/proper: beanutils/trunk/ betwixt/trunk/ chain/trunk/ cli/trunk/ codec/trunk/ collections/trunk/ configuration/trunk/ daemon/trunk/ dbcp/trunk/ dbutils/trunk/ digester
Author: niallp
Date: Sun Mar 9 07:21:48 2008
New Revision: 635244
URL: http://svn.apache.org/viewvc?rev=635244&view=rev
Log:
Upgrade to version 9 of commons-parent
Modified:
commons/proper/beanutils/trunk/pom.xml
commons/proper/betwixt/trunk/pom.xml
commons/proper/chain/trunk/pom.xml
commons/proper/cli/trunk/pom.xml
commons/proper/codec/trunk/pom.xml
commons/proper/collections/trunk/pom.xml
commons/proper/configuration/trunk/pom.xml
commons/proper/daemon/trunk/pom.xml
commons/proper/dbcp/trunk/pom.xml
commons/proper/dbutils/trunk/pom.xml
commons/proper/digester/trunk/pom.xml
commons/proper/discovery/trunk/pom.xml
commons/proper/el/trunk/pom.xml
commons/proper/email/trunk/pom.xml
commons/proper/fileupload/trunk/pom.xml
commons/proper/io/trunk/pom.xml
commons/proper/jci/trunk/compilers/eclipse/pom.xml
commons/proper/jci/trunk/compilers/groovy/pom.xml
commons/proper/jci/trunk/compilers/janino/pom.xml
commons/proper/jci/trunk/compilers/javac/pom.xml
commons/proper/jci/trunk/compilers/jsr199/pom.xml
commons/proper/jci/trunk/compilers/rhino/pom.xml
commons/proper/jci/trunk/core/pom.xml
commons/proper/jci/trunk/examples/pom.xml
commons/proper/jci/trunk/fam/pom.xml
commons/proper/jci/trunk/pom.xml
commons/proper/jexl/trunk/pom.xml
commons/proper/jxpath/trunk/pom.xml
commons/proper/lang/trunk/pom.xml
commons/proper/launcher/trunk/pom.xml
commons/proper/logging/trunk/pom.xml
commons/proper/math/trunk/pom.xml
commons/proper/modeler/trunk/pom.xml
commons/proper/net/trunk/pom.xml
commons/proper/pool/trunk/pom.xml
commons/proper/primitives/trunk/pom.xml
commons/proper/proxy/trunk/pom.xml
commons/proper/scxml/trunk/pom.xml
commons/proper/transaction/trunk/pom.xml
commons/proper/validator/trunk/pom.xml
commons/proper/vfs/trunk/core/pom.xml
commons/proper/vfs/trunk/examples/pom.xml
commons/proper/vfs/trunk/pom.xml
commons/proper/vfs/trunk/sandbox/pom.xml
Modified: commons/proper/beanutils/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/pom.xml?rev=635244&r1=635243&r2=635244&view=diff
==
--- commons/proper/beanutils/trunk/pom.xml (original)
+++ commons/proper/beanutils/trunk/pom.xml Sun Mar 9 07:21:48 2008
@@ -22,10 +22,9 @@
org.apache.commons
commons-parent
-8
+9
4.0.0
- bundle
commons-beanutils
commons-beanutils
1.8.0-SNAPSHOT
@@ -243,6 +242,10 @@
BEANUTILS
12310460
+
+ !org.apache.commons.collections,
+ org.apache.commons.beanutils.*;version=${pom.version}
+
Modified: commons/proper/betwixt/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/betwixt/trunk/pom.xml?rev=635244&r1=635243&r2=635244&view=diff
==
--- commons/proper/betwixt/trunk/pom.xml (original)
+++ commons/proper/betwixt/trunk/pom.xml Sun Mar 9 07:21:48 2008
@@ -22,10 +22,9 @@
org.apache.commons
commons-parent
-8
+9
4.0.0
- bundle
commons-betwixt
commons-betwixt
0.9-SNAPSHOT
Modified: commons/proper/chain/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/chain/trunk/pom.xml?rev=635244&r1=635243&r2=635244&view=diff
==
--- commons/proper/chain/trunk/pom.xml (original)
+++ commons/proper/chain/trunk/pom.xml Sun Mar 9 07:21:48 2008
@@ -21,10 +21,9 @@
org.apache.commons
commons-parent
-8
+9
4.0.0
-bundle
commons-chain
commons-chain
1.2-SNAPSHOT
@@ -91,6 +90,8 @@
CHAIN
12310462
+!javax.portlet,*
+javax.portlet
Modified: commons/proper/cli/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/cli/trunk/pom.xml?rev=635244&r1=635243&r2=635244&view=diff
==
--- commons/proper/cli/trunk/pom.xml (original)
+++ commons/proper/cli/trunk/pom.xml Sun Mar 9 07:21:48 2008
@@ -22,10 +22,9 @@
org.apache.commons
commons-parent
-8
+9
4.0.0
- bundle
commons-cli
commons-cli
2.0-SNAPSHOT
Modified: commons/proper/codec/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=635244&r1=635243&r2=635244&view=diff
==
--- commons/proper/codec/trunk/pom.xml (original)
+++ commons/proper/codec/trunk/pom.xml Sun Mar 9 07:21:48 2008
@@ -22,10 +22,9 @@
org.apache.commons
commons-parent
-8
+9
4.0.0
- bundle
commons-codec
commons-codec
1.4-SNAPSHOT
Modified: commons/proper/co
svn commit: r635246 - /commons/proper/collections/branches/collections_jdk5_branch/pom.xml
Author: niallp Date: Sun Mar 9 07:22:38 2008 New Revision: 635246 URL: http://svn.apache.org/viewvc?rev=635246&view=rev Log: Upgrade to version 9 of commons-parent Modified: commons/proper/collections/branches/collections_jdk5_branch/pom.xml Modified: commons/proper/collections/branches/collections_jdk5_branch/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/collections_jdk5_branch/pom.xml?rev=635246&r1=635245&r2=635246&view=diff == --- commons/proper/collections/branches/collections_jdk5_branch/pom.xml (original) +++ commons/proper/collections/branches/collections_jdk5_branch/pom.xml Sun Mar 9 07:22:38 2008 @@ -22,10 +22,9 @@ org.apache.commons commons-parent -8 +9 4.0.0 - bundle commons-collections commons-collections 3.3-SNAPSHOT
svn commit: r635247 - /commons/proper/configuration/branches/configuration2_experimental/pom.xml
Author: niallp
Date: Sun Mar 9 07:23:09 2008
New Revision: 635247
URL: http://svn.apache.org/viewvc?rev=635247&view=rev
Log:
Upgrade to version 9 of commons-parent
Modified:
commons/proper/configuration/branches/configuration2_experimental/pom.xml
Modified:
commons/proper/configuration/branches/configuration2_experimental/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/pom.xml?rev=635247&r1=635246&r2=635247&view=diff
==
--- commons/proper/configuration/branches/configuration2_experimental/pom.xml
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/pom.xml
Sun Mar 9 07:23:09 2008
@@ -25,10 +25,9 @@
org.apache.commons
commons-parent
-8
+9
4.0.0
- bundle
org.apache.commons
commons-configuration2
2.0-SNAPSHOT
@@ -377,13 +376,6 @@
-
- org.apache.commons
- commons-build-plugin
-
-
commons-${commons.componentid}-${commons.release.version}
-
-
@@ -411,6 +403,7 @@
1.5
configuration
1.5
+
commons-configuration-${commons.release.version}
org.apache.commons.configuration2
CONFIGURATION
svn commit: r635248 - /commons/proper/jexl/branches/2.0/pom.xml
Author: niallp Date: Sun Mar 9 07:23:36 2008 New Revision: 635248 URL: http://svn.apache.org/viewvc?rev=635248&view=rev Log: Upgrade to version 9 of commons-parent Modified: commons/proper/jexl/branches/2.0/pom.xml Modified: commons/proper/jexl/branches/2.0/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/pom.xml?rev=635248&r1=635247&r2=635248&view=diff == --- commons/proper/jexl/branches/2.0/pom.xml (original) +++ commons/proper/jexl/branches/2.0/pom.xml Sun Mar 9 07:23:36 2008 @@ -22,10 +22,9 @@ org.apache.commons commons-parent -8 +9 4.0.0 - bundle commons-jexl commons-jexl 2.0-SNAPSHOT
svn commit: r635249 - /commons/proper/pool/branches/1_4_RELEASE_BRANCH/pom.xml
Author: niallp Date: Sun Mar 9 07:24:00 2008 New Revision: 635249 URL: http://svn.apache.org/viewvc?rev=635249&view=rev Log: Upgrade to version 9 of commons-parent Modified: commons/proper/pool/branches/1_4_RELEASE_BRANCH/pom.xml Modified: commons/proper/pool/branches/1_4_RELEASE_BRANCH/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/1_4_RELEASE_BRANCH/pom.xml?rev=635249&r1=635248&r2=635249&view=diff == --- commons/proper/pool/branches/1_4_RELEASE_BRANCH/pom.xml (original) +++ commons/proper/pool/branches/1_4_RELEASE_BRANCH/pom.xml Sun Mar 9 07:24:00 2008 @@ -22,10 +22,9 @@ org.apache.commons commons-parent -8 +9 4.0.0 - bundle commons-pool commons-pool 1.4
svn commit: r635250 - /commons/proper/scxml/branches/J5/pom.xml
Author: niallp Date: Sun Mar 9 07:24:40 2008 New Revision: 635250 URL: http://svn.apache.org/viewvc?rev=635250&view=rev Log: Upgrade to version 9 of commons-parent Modified: commons/proper/scxml/branches/J5/pom.xml Modified: commons/proper/scxml/branches/J5/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/pom.xml?rev=635250&r1=635249&r2=635250&view=diff == --- commons/proper/scxml/branches/J5/pom.xml (original) +++ commons/proper/scxml/branches/J5/pom.xml Sun Mar 9 07:24:40 2008 @@ -22,11 +22,10 @@ org.apache.commons commons-parent -8 +9 4.0.0 - bundle Commons SCXML commons-scxml commons-scxml
svn commit: r635251 - /commons/proper/transaction/branches/TRANSACTION_2/pom.xml
Author: niallp Date: Sun Mar 9 07:25:04 2008 New Revision: 635251 URL: http://svn.apache.org/viewvc?rev=635251&view=rev Log: Upgrade to version 9 of commons-parent Modified: commons/proper/transaction/branches/TRANSACTION_2/pom.xml Modified: commons/proper/transaction/branches/TRANSACTION_2/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/transaction/branches/TRANSACTION_2/pom.xml?rev=635251&r1=635250&r2=635251&view=diff == --- commons/proper/transaction/branches/TRANSACTION_2/pom.xml (original) +++ commons/proper/transaction/branches/TRANSACTION_2/pom.xml Sun Mar 9 07:25:04 2008 @@ -22,10 +22,9 @@ org.apache.commons commons-parent -8 +9 4.0.0 - bundle commons-transaction commons-transaction 2.0-SNAPSHOT
svn commit: r635305 - /commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
Author: rwinston
Date: Sun Mar 9 10:31:56 2008
New Revision: 635305
URL: http://svn.apache.org/viewvc?rev=635305&view=rev
Log:
NET-198
Modified:
commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
Modified:
commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java?rev=635305&r1=635304&r2=635305&view=diff
==
---
commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
(original)
+++
commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
Sun Mar 9 10:31:56 2008
@@ -74,7 +74,6 @@
*/
public Calendar parseTimestamp(String timestampStr) throws
ParseException {
Calendar now = Calendar.getInstance();
- now.setTimeZone(this.getServerTimeZone());
return parseTimestamp(timestampStr, now);
}
@@ -93,7 +92,8 @@
* @param now The current time
*/
public Calendar parseTimestamp(String timestampStr, Calendar now)
throws ParseException {
- Calendar working = Calendar.getInstance();
+ now.setTimeZone(this.getServerTimeZone());
+ Calendar working = (Calendar) now.clone();;
working.setTimeZone(getServerTimeZone());
ParsePosition pp = new ParsePosition(0);
@@ -122,7 +122,7 @@
// This is pretty bad hack to work around the
deficiencies of the JDK date/time classes.
if (recentDateFormat != null) {
pp = new ParsePosition(0);
- int year =
Calendar.getInstance().get(Calendar.YEAR);
+ int year = now.get(Calendar.YEAR);
String timeStampStrPlusYear = timestampStr + "
" + year;
SimpleDateFormat hackFormatter = new
SimpleDateFormat(recentDateFormat.toPattern() + " ",
recentDateFormat.getDateFormatSymbols());
svn commit: r635306 - /commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
Author: rwinston
Date: Sun Mar 9 10:32:18 2008
New Revision: 635306
URL: http://svn.apache.org/viewvc?rev=635306&view=rev
Log:
NET-198
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java?rev=635306&r1=635305&r2=635306&view=diff
==
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
Sun Mar 9 10:32:18 2008
@@ -74,7 +74,6 @@
*/
public Calendar parseTimestamp(String timestampStr) throws
ParseException {
Calendar now = Calendar.getInstance();
- now.setTimeZone(this.getServerTimeZone());
return parseTimestamp(timestampStr, now);
}
@@ -93,7 +92,8 @@
* @param now The current time
*/
public Calendar parseTimestamp(String timestampStr, Calendar now)
throws ParseException {
- Calendar working = Calendar.getInstance();
+ now.setTimeZone(this.getServerTimeZone());
+ Calendar working = (Calendar) now.clone();;
working.setTimeZone(getServerTimeZone());
ParsePosition pp = new ParsePosition(0);
@@ -122,7 +122,7 @@
// This is pretty bad hack to work around the
deficiencies of the JDK date/time classes.
if (recentDateFormat != null) {
pp = new ParsePosition(0);
- int year =
Calendar.getInstance().get(Calendar.YEAR);
+ int year = now.get(Calendar.YEAR);
String timeStampStrPlusYear = timestampStr + "
" + year;
SimpleDateFormat hackFormatter = new
SimpleDateFormat(recentDateFormat.toPattern() + " ",
recentDateFormat.getDateFormatSymbols());
svn commit: r635307 - in /commons/proper/net/branches/NET_2_0/src: main/java/org/apache/commons/net/tftp/TFTPServer.java test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java test/java/org/apa
Author: rwinston
Date: Sun Mar 9 10:32:45 2008
New Revision: 635307
URL: http://svn.apache.org/viewvc?rev=635307&view=rev
Log:
Make default logger a no-op
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPServer.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPServer.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPServer.java?rev=635307&r1=635306&r2=635307&view=diff
==
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPServer.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/tftp/TFTPServer.java
Sun Mar 9 10:32:45 2008
@@ -46,7 +46,7 @@
* To check to see if the server is still running (or if it stopped because of
an error), call the
* isRunning() method.
*
- * By default, logs debug info and errors to the console streams. This can be
changed with the
+ * By default, events are not logged to stdout/stderr. This can be changed
with the
* setLog and setLogError methods.
*
*
@@ -81,11 +81,8 @@
public class TFTPServer implements Runnable
{
- private static final int DEFAULT_TFTP_PORT = 69;
- // Modes for the server. These should be an enum, in java 1.5
- public static final int GET_ONLY = 0;
- public static final int PUT_ONLY = 1;
- public static final int GET_AND_PUT = 2;
+ private static final int DEFAULT_TFTP_PORT = 69;
+ public static enum ServerMode { GET_ONLY, PUT_ONLY, GET_AND_PUT; }
private HashSet transfers_ = new HashSet();
private volatile boolean shutdown_ = false;
@@ -94,16 +91,25 @@
private File serverWriteDirectory_;
private int port_;
private Exception serverException = null;
- private int mode_;
+ private ServerMode mode_;
+
+ /* /dev/null output stream (default) */
+ private static final PrintStream nullStream = new PrintStream(
+ new OutputStream() {
+ public void write(int b){}
+ public void write(byte[] b) throws IOException
{}
+ }
+ );
// don't have access to a logger api, so we will log to these streams,
which
- // by default are set to the console.
+ // by default are set to a no-op logger
private PrintStream log_;
private PrintStream logError_;
private int maxTimeoutRetries_ = 3;
private int socketTimeout_;
-
+
+
/**
* Start a TFTP Server on the default port (69). Gets and Puts occur in
the specified
* directories.
@@ -120,7 +126,7 @@
* @param mode A value as specified above.
* @throws IOException if the server directory is invalid or does not
exist.
*/
- public TFTPServer(File serverReadDirectory, File serverWriteDirectory,
int mode)
+ public TFTPServer(File serverReadDirectory, File serverWriteDirectory,
ServerMode mode)
throws IOException
{
this(serverReadDirectory, serverWriteDirectory,
DEFAULT_TFTP_PORT, mode, null, null);
@@ -143,13 +149,13 @@
* @param errorLog Stream to write error messages to. If not provided,
uses System.err.
* @throws IOException if the server directory is invalid or does not
exist.
*/
- public TFTPServer(File serverReadDirectory, File serverWriteDirectory,
int port, int mode,
+ public TFTPServer(File serverReadDirectory, File serverWriteDirectory,
int port, ServerMode mode,
PrintStream log, PrintStream errorLog) throws
IOException
{
port_ = port;
mode_ = mode;
- log_ = (log == null ? System.out : log);
- logError_ = (errorLog == null ? System.err : errorLog);
+ log_ = (log == null ? nullStream: log);
+ logError_ = (errorLog == null ? nullStream : errorLog);
launch(serverReadDirectory, serverWriteDirectory);
}
@@ -413,7 +419,7 @@
InputStream is = null;
try
{
- if (mode_ == PUT_ONLY)
+ if (mode_ == ServerMode.PUT_ONLY)
{
transferTftp_.bufferedSend(new
TFTPErrorPacket(trrp.getAddress(), trrp
.getPort(),
TFTPErrorPacket.ILLEGAL_OPERATION,
svn commit: r635309 - /commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
Author: rwinston Date: Sun Mar 9 10:33:39 2008 New Revision: 635309 URL: http://svn.apache.org/viewvc?rev=635309&view=rev Log: Remove unused import Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java?rev=635309&r1=635308&r2=635309&view=diff == --- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java (original) +++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java Sun Mar 9 10:33:39 2008 @@ -23,7 +23,6 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import java.util.GregorianCalendar; import java.util.TimeZone; import org.apache.commons.net.ftp.Configurable;
svn commit: r635310 - /commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
Author: rwinston Date: Sun Mar 9 10:34:22 2008 New Revision: 635310 URL: http://svn.apache.org/viewvc?rev=635310&view=rev Log: Remove unused import Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java Modified: commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java?rev=635310&r1=635309&r2=635310&view=diff == --- commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java (original) +++ commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java Sun Mar 9 10:34:22 2008 @@ -20,7 +20,6 @@ import java.net.SocketException; import java.util.Calendar; import java.util.Comparator; -import java.util.Iterator; import java.util.TreeSet; import junit.framework.TestCase;
svn commit: r635335 - /commons/proper/io/trunk/pom.xml
Author: niallp Date: Sun Mar 9 12:37:06 2008 New Revision: 635335 URL: http://svn.apache.org/viewvc?rev=635335&view=rev Log: Remove profiles, no longer required with the latest commons-parent release Modified: commons/proper/io/trunk/pom.xml Modified: commons/proper/io/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/pom.xml?rev=635335&r1=635334&r2=635335&view=diff == --- commons/proper/io/trunk/pom.xml (original) +++ commons/proper/io/trunk/pom.xml Sun Mar 9 12:37:06 2008 @@ -301,83 +301,4 @@ - - - - release - - - -maven-site-plugin - - - - site - -package - - - - -maven-antrun-plugin - - - - run - -package - - - - - - - - - - - -maven-assembly-plugin - - - - attached - -package - - - - - - - - rc - - - -maven-site-plugin - - - - site - -package - - - - -maven-assembly-plugin - - - - attached - -package - - - - - - -
svn commit: r635339 - /commons/proper/proxy/trunk/pom.xml
Author: niallp
Date: Sun Mar 9 12:57:34 2008
New Revision: 635339
URL: http://svn.apache.org/viewvc?rev=635339&view=rev
Log:
Remove plugins from "rc" profile as these are now in the laetst commons-parent
release
Modified:
commons/proper/proxy/trunk/pom.xml
Modified: commons/proper/proxy/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/pom.xml?rev=635339&r1=635338&r2=635339&view=diff
==
--- commons/proper/proxy/trunk/pom.xml (original)
+++ commons/proper/proxy/trunk/pom.xml Sun Mar 9 12:57:34 2008
@@ -263,76 +263,6 @@
-
-
-
-maven-assembly-plugin
-
-
-
-attached
-
-package
-
-
-
-
-maven-gpg-plugin
-
-${gpg.passphrase}
-
-
-
-sign-artifacts
-package
-
-sign
-
-
-
-
-
-maven-install-plugin
-
-true
-
-
-
-maven-source-plugin
-
-
-create-source-jar
-
-jar
-
-package
-
-
-
-
-maven-release-plugin
-
-
--Prc
-
-
-
-maven-javadoc-plugin
-
-
-create-javadoc-jar
-
-jar
-
-package
-
-${maven.compile.source}
-
-
-
-
-
-
svn commit: r635358 - /commons/proper/configuration/branches/configuration2_experimental/pom.xml
Author: niallp
Date: Sun Mar 9 14:01:36 2008
New Revision: 635358
URL: http://svn.apache.org/viewvc?rev=635358&view=rev
Log:
Correct OSGi Bundle-symbolicName property (changed from commons parent 8 to 9)
Modified:
commons/proper/configuration/branches/configuration2_experimental/pom.xml
Modified:
commons/proper/configuration/branches/configuration2_experimental/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/pom.xml?rev=635358&r1=635357&r2=635358&view=diff
==
--- commons/proper/configuration/branches/configuration2_experimental/pom.xml
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/pom.xml
Sun Mar 9 14:01:36 2008
@@ -404,7 +404,7 @@
configuration
1.5
commons-configuration-${commons.release.version}
-
org.apache.commons.configuration2
+
org.apache.commons.configuration2
CONFIGURATION
12310467
svn commit: r635412 - /commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Author: sebb
Date: Sun Mar 9 19:00:21 2008
New Revision: 635412
URL: http://svn.apache.org/viewvc?rev=635412&view=rev
Log:
Add extra short date tests.
Currently the following tests will fail on Java 1.4:
testParseShortFutureDates
testFeb29IfLeapYear
testFeb29LeapYear
The Feb29 tests currently pass on Java 1.5+
Modified:
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Modified:
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java?rev=635412&r1=635411&r2=635412&view=diff
==
---
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Sun Mar 9 19:00:21 2008
@@ -16,10 +16,12 @@
*/
package org.apache.commons.net.ftp.parser;
+import java.text.Format;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
+import java.util.GregorianCalendar;
import java.util.TimeZone;
import org.apache.commons.net.ftp.FTPClientConfig;
@@ -28,10 +30,10 @@
import junit.framework.TestSuite;
/**
+ * Test the FTPTimestampParser class.
+ *
* @author scohen
*
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
*/
public class FTPTimestampParserImplTest extends TestCase {
@@ -221,6 +223,80 @@
}
}
+/*
+ * Check how short date is interpreted at a given time
+ */
+private void checkShortParse(String msg, Calendar now, Calendar input)
throws Exception {
+FTPTimestampParserImpl parser = new FTPTimestampParserImpl();
+Format shortFormat = parser.getRecentDateFormat(); // It's expecting
this format
+Format longFormat = new SimpleDateFormat("-MM-dd hh:mm");
+
+final String shortDate = shortFormat.format(input.getTime());
+Calendar output=parser.parseTimestamp(shortDate, now);
+int outyear = output.get(Calendar.YEAR);
+int outdom = output.get(Calendar.DAY_OF_MONTH);
+int outmon = output.get(Calendar.MONTH);
+int inyear = input.get(Calendar.YEAR);
+int indom = input.get(Calendar.DAY_OF_MONTH);
+int inmon = input.get(Calendar.MONTH);
+if (indom != outdom || inmon != outmon || inyear != outyear){
+fail("Test: '"+msg+"' Server="+longFormat.format(now.getTime())
++". Failed to parse "+shortDate
++". Actual "+longFormat.format(output.getTime())
++". Expected "+longFormat.format(input.getTime()));
+}
+}
+
+public void testParseShortPastDates() throws Exception {
+GregorianCalendar now = new GregorianCalendar();
+checkShortParse("Now",now,now); // should always work
+GregorianCalendar target = (GregorianCalendar) now.clone();
+target.add(Calendar.WEEK_OF_YEAR, -1);
+checkShortParse("Now -1 week",now,target);
+target.add(Calendar.WEEK_OF_YEAR, -12);
+checkShortParse("Now -13 weeks",now,target);
+target.add(Calendar.WEEK_OF_YEAR, -13);
+checkShortParse("Now -26 weeks",now,target);
+}
+
+public void testParseShortFutureDates() throws Exception {
+GregorianCalendar now = new GregorianCalendar();
+checkShortParse("Now",now,now); // should always work
+GregorianCalendar target = (GregorianCalendar) now.clone();
+target.add(Calendar.WEEK_OF_YEAR, 1);
+checkShortParse("Now +1 week",now,target);
+target.add(Calendar.WEEK_OF_YEAR, 12);
+checkShortParse("Now +13 weeks",now,target);
+target.add(Calendar.WEEK_OF_YEAR, 13);
+checkShortParse("Now +26 weeks",now,target);
+}
+
+// Test leap year if current year is a leap year
+public void testFeb29IfLeapYear() throws Exception{
+GregorianCalendar now = new GregorianCalendar();
+final int thisYear = now.get(Calendar.YEAR);
+if (now.isLeapYear(thisYear) && now.before(new
GregorianCalendar(thisYear,Calendar.AUGUST,29))){
+GregorianCalendar target = new
GregorianCalendar(thisYear,Calendar.FEBRUARY,29);
+checkShortParse("Feb 29th",now,target);
+} else {
+System.out.println("Skipping Feb 29 test");
+}
+}
+
+// Test Feb 29 for a known leap year
+public void testFeb29LeapYear() throws Exception{
+int year = 2000; // Use same year for current and short date
+GregorianCalendar
svn commit: r635413 - /commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Author: sebb
Date: Sun Mar 9 19:02:13 2008
New Revision: 635413
URL: http://svn.apache.org/viewvc?rev=635413&view=rev
Log:
Add extra short date tests.
Currently the following tests will fail on Java 1.4:
testParseShortFutureDates
testFeb29IfLeapYear
testFeb29LeapYear
The Feb29 tests currently pass on Java 1.5+
Modified:
commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Modified:
commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java?rev=635413&r1=635412&r2=635413&view=diff
==
---
commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
(original)
+++
commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Sun Mar 9 19:02:13 2008
@@ -16,10 +16,12 @@
*/
package org.apache.commons.net.ftp.parser;
+import java.text.Format;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
+import java.util.GregorianCalendar;
import java.util.TimeZone;
import org.apache.commons.net.ftp.FTPClientConfig;
@@ -28,10 +30,10 @@
import junit.framework.TestSuite;
/**
+ * Test the FTPTimestampParser class.
+ *
* @author scohen
*
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
*/
public class FTPTimestampParserImplTest extends TestCase {
@@ -39,7 +41,6 @@
public void testParseTimestamp() {
Calendar cal = Calendar.getInstance();
- int timeZoneOffset = cal.getTimeZone().getRawOffset();
cal.add(Calendar.HOUR_OF_DAY, 1);
cal.set(Calendar.SECOND,0);
cal.set(Calendar.MILLISECOND,0);
@@ -60,7 +61,6 @@
public void testParseTimestampWithSlop() {
Calendar cal = Calendar.getInstance();
- int timeZoneOffset = cal.getTimeZone().getRawOffset();
cal.add(Calendar.HOUR_OF_DAY, 1);
cal.set(Calendar.SECOND,0);
cal.set(Calendar.MILLISECOND,0);
@@ -223,6 +223,80 @@
}
}
+/*
+ * Check how short date is interpreted at a given time
+ */
+private void checkShortParse(String msg, Calendar now, Calendar input)
throws Exception {
+FTPTimestampParserImpl parser = new FTPTimestampParserImpl();
+Format shortFormat = parser.getRecentDateFormat(); // It's expecting
this format
+Format longFormat = new SimpleDateFormat("-MM-dd hh:mm");
+
+final String shortDate = shortFormat.format(input.getTime());
+Calendar output=parser.parseTimestamp(shortDate, now);
+int outyear = output.get(Calendar.YEAR);
+int outdom = output.get(Calendar.DAY_OF_MONTH);
+int outmon = output.get(Calendar.MONTH);
+int inyear = input.get(Calendar.YEAR);
+int indom = input.get(Calendar.DAY_OF_MONTH);
+int inmon = input.get(Calendar.MONTH);
+if (indom != outdom || inmon != outmon || inyear != outyear){
+fail("Test: '"+msg+"' Server="+longFormat.format(now.getTime())
++". Failed to parse "+shortDate
++". Actual "+longFormat.format(output.getTime())
++". Expected "+longFormat.format(input.getTime()));
+}
+}
+
+public void testParseShortPastDates() throws Exception {
+GregorianCalendar now = new GregorianCalendar();
+checkShortParse("Now",now,now); // should always work
+GregorianCalendar target = (GregorianCalendar) now.clone();
+target.add(Calendar.WEEK_OF_YEAR, -1);
+checkShortParse("Now -1 week",now,target);
+target.add(Calendar.WEEK_OF_YEAR, -12);
+checkShortParse("Now -13 weeks",now,target);
+target.add(Calendar.WEEK_OF_YEAR, -13);
+checkShortParse("Now -26 weeks",now,target);
+}
+
+public void testParseShortFutureDates() throws Exception {
+GregorianCalendar now = new GregorianCalendar();
+checkShortParse("Now",now,now); // should always work
+GregorianCalendar target = (GregorianCalendar) now.clone();
+target.add(Calendar.WEEK_OF_YEAR, 1);
+checkShortParse("Now +1 week",now,target);
+target.add(Calendar.WEEK_OF_YEAR, 12);
+checkShortParse("Now +13 weeks",now,target);
+target.add(Calendar.WEEK_OF_YEAR, 13);
+checkShortParse("Now +26 weeks",now,target);
+}
+
+// Test leap year if current year is a leap year
+public void testFeb29IfLeapYear() throws Exception{
+GregorianCalendar now = new GregorianCalendar();
+
svn propchange: r635412 - svn:log
Author: sebb Revision: 635412 Modified property: svn:log Modified: svn:log at Sun Mar 9 19:03:39 2008 -- --- svn:log (original) +++ svn:log Sun Mar 9 19:03:39 2008 @@ -1,6 +1,3 @@ Add extra short date tests. -Currently the following tests will fail on Java 1.4: +Currently the following test will fail: testParseShortFutureDates - testFeb29IfLeapYear - testFeb29LeapYear -The Feb29 tests currently pass on Java 1.5+
svn commit: r635447 - in /commons/proper/lang/trunk/src/java/org/apache/commons/lang: StringUtils.java text/ExtendedMessageFormat.java
Author: bayard
Date: Sun Mar 9 23:27:09 2008
New Revision: 635447
URL: http://svn.apache.org/viewvc?rev=635447&view=rev
Log:
Dealing with some of the >120 length lines as per checkstyle. A few still need
reducing.
Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java
commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/ExtendedMessageFormat.java
Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java?rev=635447&r1=635446&r2=635447&view=diff
==
--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java
(original)
+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java
Sun Mar 9 23:27:09 2008
@@ -2334,7 +2334,9 @@
* @return an array of parsed Strings, null if null String
input
* @since 2.4
*/
-private static String[] splitByWholeSeparatorWorker(String str, String
separator, int max, boolean preserveAllTokens) {
+private static String[] splitByWholeSeparatorWorker(String str, String
separator, int max,
+boolean
preserveAllTokens)
+{
if (str == null) {
return null;
}
@@ -3566,20 +3568,20 @@
*
*
*
- * StringUtils.replaceEach(null, *, *, *)= null
- * StringUtils.replaceEach("", *, *, *) = ""
+ * StringUtils.replaceEach(null, *, *, *) = null
+ * StringUtils.replaceEach("", *, *, *) = ""
* StringUtils.replaceEach("aba", null, null, *) = "aba"
* StringUtils.replaceEach("aba", new String[0], null, *) = "aba"
* StringUtils.replaceEach("aba", null, new String[0], *) = "aba"
- * StringUtils.replaceEach("aba", new String[]{"a"}, null, *) = "aba"
- * StringUtils.replaceEach("aba", new String[]{"a"}, new String[]{""}, *)
= "b"
- * StringUtils.replaceEach("aba", new String[]{null}, new String[]{"a"},
*) = "aba"
- * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"w", "t"}, *) = "wcte"
+ * StringUtils.replaceEach("aba", new String[]{"a"}, null, *) = "aba"
+ * StringUtils.replaceEach("aba", new String[]{"a"}, new String[]{""}, *)
= "b"
+ * StringUtils.replaceEach("aba", new String[]{null}, new String[]{"a"},
*) = "aba"
+ * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"w", "t"}, *) = "wcte"
* (example of how it repeats)
- * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"d", "t"}, false) = "dcte"
- * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"d", "t"}, true) = "tcte"
- * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"d", "ab"}, true) = IllegalArgumentException
- * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"d", "ab"}, false) = "dcabe"
+ * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"d", "t"}, false) = "dcte"
+ * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"d", "t"}, true) = "tcte"
+ * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"d", "ab"}, true) = IllegalArgumentException
+ * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"d", "ab"}, false) = "dcabe"
*
*
* @param text
@@ -3617,19 +3619,19 @@
*
*
*
- * StringUtils.replaceEach(null, *, *, *)= null
- * StringUtils.replaceEach("", *, *, *) = ""
+ * StringUtils.replaceEach(null, *, *, *) = null
+ * StringUtils.replaceEach("", *, *, *) = ""
* StringUtils.replaceEach("aba", null, null, *) = "aba"
* StringUtils.replaceEach("aba", new String[0], null, *) = "aba"
* StringUtils.replaceEach("aba", null, new String[0], *) = "aba"
- * StringUtils.replaceEach("aba", new String[]{"a"}, null, *) = "aba"
- * StringUtils.replaceEach("aba", new String[]{"a"}, new String[]{""}, *)
= "b"
- * StringUtils.replaceEach("aba", new String[]{null}, new String[]{"a"},
*) = "aba"
- * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"w", "t"}, *) = "wcte"
+ * StringUtils.replaceEach("aba", new String[]{"a"}, null, *) = "aba"
+ * StringUtils.replaceEach("aba", new String[]{"a"}, new String[]{""}, *)
= "b"
+ * StringUtils.replaceEach("aba", new String[]{null}, new String[]{"a"},
*) = "aba"
+ * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"w", "t"}, *) = "wcte"
* (example of how it repeats)
- * StringUtils.replaceEach("abcde", new String[]{"ab", "d"}, new
String[]{"d", "t"}, false) = "dcte"
- * StringUtils.replaceEach("a
svn commit: r635453 - in /commons/sandbox/csv/trunk/src/test/org/apache/commons/csv: CSVParserTest.java CSVStrategyTest.java
Author: bayard Date: Sun Mar 9 23:38:55 2008 New Revision: 635453 URL: http://svn.apache.org/viewvc?rev=635453&view=rev Log: Removing unused imports Modified: commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVParserTest.java commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVStrategyTest.java Modified: commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVParserTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVParserTest.java?rev=635453&r1=635452&r2=635453&view=diff == --- commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVParserTest.java (original) +++ commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVParserTest.java Sun Mar 9 23:38:55 2008 @@ -21,9 +21,7 @@ import java.io.StringReader; import java.util.Arrays; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * CSVParserTest Modified: commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVStrategyTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVStrategyTest.java?rev=635453&r1=635452&r2=635453&view=diff == --- commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVStrategyTest.java (original) +++ commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/CSVStrategyTest.java Sun Mar 9 23:38:55 2008 @@ -18,9 +18,7 @@ import java.io.StringReader; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * CSVStrategyTest
svn commit: r635454 - /commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/writer/AllTests.java
Author: bayard Date: Sun Mar 9 23:39:46 2008 New Revision: 635454 URL: http://svn.apache.org/viewvc?rev=635454&view=rev Log: Unnecessary file Removed: commons/sandbox/csv/trunk/src/test/org/apache/commons/csv/writer/AllTests.java
