svn commit: r1195840 - in /commons/proper/compress/trunk: doap_compress.rdf pom.xml src/changes/changes.xml
Author: bodewig Date: Tue Nov 1 06:16:11 2011 New Revision: 1195840 URL: http://svn.apache.org/viewvc?rev=1195840view=rev Log: 1.3 has been released, open up for 1.4 Modified: commons/proper/compress/trunk/doap_compress.rdf commons/proper/compress/trunk/pom.xml commons/proper/compress/trunk/src/changes/changes.xml Modified: commons/proper/compress/trunk/doap_compress.rdf URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/doap_compress.rdf?rev=1195840r1=1195839r2=1195840view=diff == --- commons/proper/compress/trunk/doap_compress.rdf (original) +++ commons/proper/compress/trunk/doap_compress.rdf Tue Nov 1 06:16:11 2011 @@ -36,14 +36,25 @@ release Version namecommons-compress/name +created2011-11-01/created +revision1.3/revision + /Version +/release +release + Version +namecommons-compress/name created2011-07-31/created revision1.2/revision /Version +/release +release Version namecommons-compress/name created2010-08-13/created revision1.1/revision /Version +/release +release Version namecommons-compress/name created2009-05-21/created Modified: commons/proper/compress/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/pom.xml?rev=1195840r1=1195839r2=1195840view=diff == --- commons/proper/compress/trunk/pom.xml (original) +++ commons/proper/compress/trunk/pom.xml Tue Nov 1 06:16:11 2011 @@ -25,7 +25,7 @@ groupIdorg.apache.commons/groupId artifactIdcommons-compress/artifactId - version1.3-SNAPSHOT/version + version1.4-SNAPSHOT/version nameCommons Compress/name urlhttp://commons.apache.org/compress//url description Modified: commons/proper/compress/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/changes/changes.xml?rev=1195840r1=1195839r2=1195840view=diff == --- commons/proper/compress/trunk/src/changes/changes.xml (original) +++ commons/proper/compress/trunk/src/changes/changes.xml Tue Nov 1 06:16:11 2011 @@ -44,7 +44,10 @@ The action type attribute can be add,u titlecommons-compress/title /properties body -release version=1.3 date=unreleased +release version=1.4 date=unreleased + description=Release 1.4 +/release +release version=1.3 date=2011-11-01 description=Release 1.3 - API compatible to 1.2 but requires Java5 at runtime action issue=COMPRESS-142 type=add date=2011-09-14 Support for the Pack200 format has been added.
svn commit: r1195879 - in /commons/proper/ognl/trunk/src: changes/changes.xml site/site.xml
Author: mcucchiara Date: Tue Nov 1 08:56:20 2011 New Revision: 1195879 URL: http://svn.apache.org/viewvc?rev=1195879view=rev Log: OGNL-36 - Link Benchmarks on left hand navigation is broken (contributed by Adrian Cumiskey). Modified: commons/proper/ognl/trunk/src/changes/changes.xml commons/proper/ognl/trunk/src/site/site.xml Modified: commons/proper/ognl/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1195879r1=1195878r2=1195879view=diff == --- commons/proper/ognl/trunk/src/changes/changes.xml (original) +++ commons/proper/ognl/trunk/src/changes/changes.xml Tue Nov 1 08:56:20 2011 @@ -23,6 +23,7 @@ /properties body release version=4.0-incubating date=TBD description=First ASF release under Incubation. + action issue=OGNL-36 type=fix dev=mcucchiaraLink Benchmarks on left hand navigation is broken (contributed by Adrian Cumiskey)./action action issue=OGNL-33 type=update dev=mcucchiaraOGNL-33 - Improvements to JJTOgnlParserState (contributed by Adrian Cumiskey)./action action issue=OGNL-32 type=update dev=mcucchiaraOGNL-32 - CPD fix to ASTProperty (contributed by Adrian Cumiskey)./action action issue=OGNL-31 type=update dev=mcucchiaraOGNL-31 - Some CPD fixes around ASTMethod and ASTStaticMethod (contributed by Adrian Cumiskey)./action Modified: commons/proper/ognl/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/site/site.xml?rev=1195879r1=1195878r2=1195879view=diff == --- commons/proper/ognl/trunk/src/site/site.xml (original) +++ commons/proper/ognl/trunk/src/site/site.xml Tue Nov 1 08:56:20 2011 @@ -30,7 +30,7 @@ !--item name=Release Notes (4.0-incubating) href=http://www.apache.org/dist/commons/ognl/RELEASE-NOTES.txt; /-- item name=Language Guide href=/language-guide.html / item name=Developer Guide href=/developer-guide.html / - item name=Benchmarks href=/benchmark-ognl.html / + item name=Benchmarks href=/benchmark-commons-ognl.html / /menu menu name=Development
svn commit: r1195881 - /commons/proper/ognl/trunk/src/changes/changes.xml
Author: mcucchiara Date: Tue Nov 1 08:56:50 2011 New Revision: 1195881 URL: http://svn.apache.org/viewvc?rev=1195881view=rev Log: Remove duplicated issue id. Modified: commons/proper/ognl/trunk/src/changes/changes.xml Modified: commons/proper/ognl/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1195881r1=1195880r2=1195881view=diff == --- commons/proper/ognl/trunk/src/changes/changes.xml (original) +++ commons/proper/ognl/trunk/src/changes/changes.xml Tue Nov 1 08:56:50 2011 @@ -24,9 +24,9 @@ body release version=4.0-incubating date=TBD description=First ASF release under Incubation. action issue=OGNL-36 type=fix dev=mcucchiaraLink Benchmarks on left hand navigation is broken (contributed by Adrian Cumiskey)./action - action issue=OGNL-33 type=update dev=mcucchiaraOGNL-33 - Improvements to JJTOgnlParserState (contributed by Adrian Cumiskey)./action - action issue=OGNL-32 type=update dev=mcucchiaraOGNL-32 - CPD fix to ASTProperty (contributed by Adrian Cumiskey)./action - action issue=OGNL-31 type=update dev=mcucchiaraOGNL-31 - Some CPD fixes around ASTMethod and ASTStaticMethod (contributed by Adrian Cumiskey)./action + action issue=OGNL-33 type=update dev=mcucchiaraImprovements to JJTOgnlParserState (contributed by Adrian Cumiskey)./action + action issue=OGNL-32 type=update dev=mcucchiaraCPD fix to ASTProperty (contributed by Adrian Cumiskey)./action + action issue=OGNL-31 type=update dev=mcucchiaraSome CPD fixes around ASTMethod and ASTStaticMethod (contributed by Adrian Cumiskey)./action action issue=OGNL-28 type=update dev=mcucchiaraVisitor pattern needs way to propagate exceptions (contributed by Daniel Pitts)./action action issue=OGNL-27 type=update dev=simonetripodiMove toString implementations into visitor pattern (contributed by Daniel Pitts)./action action issue=OGNL-26 type=update dev=grobmeierJUnit Tests produce confusing output./action
svn commit: r1196001 - in /commons/proper/net/trunk/src: changes/changes.xml main/java/org/apache/commons/net/util/SubnetUtils.java test/java/org/apache/commons/net/SubnetUtilsTest.java
Author: sebb
Date: Tue Nov 1 14:13:54 2011
New Revision: 1196001
URL: http://svn.apache.org/viewvc?rev=1196001view=rev
Log:
NET-428 SubnetUtils throws ArrayIndexOutOfBoundsException for new SubnetUtils(
1.2.3.4/32 ).getInfo().getAllAddresses()
Modified:
commons/proper/net/trunk/src/changes/changes.xml
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java
commons/proper/net/trunk/src/test/java/org/apache/commons/net/SubnetUtilsTest.java
Modified: commons/proper/net/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1196001r1=1196000r2=1196001view=diff
==
--- commons/proper/net/trunk/src/changes/changes.xml (original)
+++ commons/proper/net/trunk/src/changes/changes.xml Tue Nov 1 14:13:54 2011
@@ -59,6 +59,9 @@ The action type attribute can be add,u
release version=3.0.2-SNAPSHOT date=TBA description=
TBA
+action issue=NET-428 dev=sebb type=fix
+SubnetUtils throws ArrayIndexOutOfBoundsException for new
SubnetUtils( 1.2.3.4/32 ).getInfo().getAllAddresses()
+/action
action issue=NET-421 dev=sebb type=fix due-to=Oliver
Saggau
Problem connecting to TLS/SSL SMTP server using explicit mode.
/action
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java?rev=1196001r1=1196000r2=1196001view=diff
==
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java
Tue Nov 1 14:13:54 2011
@@ -161,7 +161,11 @@ public class SubnetUtils {
}
public String[] getAllAddresses() {
-String[] addresses = new String[getAddressCount()];
+int ct = getAddressCount();
+String[] addresses = new String[ct];
+if (ct == 0) {
+return addresses;
+}
for (int add = low(), j=0; add = high(); ++add, ++j) {
addresses[j] = format(toArray(add));
}
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/SubnetUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/SubnetUtilsTest.java?rev=1196001r1=1196000r2=1196001view=diff
==
---
commons/proper/net/trunk/src/test/java/org/apache/commons/net/SubnetUtilsTest.java
(original)
+++
commons/proper/net/trunk/src/test/java/org/apache/commons/net/SubnetUtilsTest.java
Tue Nov 1 14:13:54 2011
@@ -290,4 +290,20 @@ public class SubnetUtilsTest extends Tes
} catch (IllegalArgumentException expected) {
}
}
+
+public void testNET428_31() throws Exception {
+final SubnetUtils subnetUtils = new SubnetUtils(1.2.3.4/31);
+assertEquals(0,subnetUtils.getInfo().getAddressCount());
+String[] address = subnetUtils.getInfo().getAllAddresses();
+assertNotNull(address);
+assertEquals(0,address.length);
+}
+
+public void testNET428_32() throws Exception {
+final SubnetUtils subnetUtils = new SubnetUtils(1.2.3.4/32);
+assertEquals(0,subnetUtils.getInfo().getAddressCount());
+String[] address = subnetUtils.getInfo().getAllAddresses();
+assertNotNull(address);
+assertEquals(0,address.length);
+}
}
svn commit: r1196004 - /commons/proper/net/trunk/src/site/xdoc/mail-lists.xml
Author: sebb Date: Tue Nov 1 14:18:58 2011 New Revision: 1196004 URL: http://svn.apache.org/viewvc?rev=1196004view=rev Log: Add local mailing lists Added: commons/proper/net/trunk/src/site/xdoc/mail-lists.xml (with props) Added: commons/proper/net/trunk/src/site/xdoc/mail-lists.xml URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/site/xdoc/mail-lists.xml?rev=1196004view=auto == --- commons/proper/net/trunk/src/site/xdoc/mail-lists.xml (added) +++ commons/proper/net/trunk/src/site/xdoc/mail-lists.xml Tue Nov 1 14:18:58 2011 @@ -0,0 +1,202 @@ +?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. +-- +!-- + +==+ + | | + | THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN | + |DO NOT EDIT DIRECTLY | + | | + +==+ + | TEMPLATE FILE: mail-lists-template.xml | + | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates | + +==+ + | | + | 1) Re-generate using: mvn commons:mail-page | + | | + | 2) Set the following properties in the component's pom: | + |- commons.componentid (required, alphabetic, lower case) | + | | + | 3) Example Properties| + | | + | properties| + |commons.componentidmath/commons.componentid | + | /properties | + | | + +==+ +-- +document + properties +titleCommons Net Mailing Lists/title +author email=d...@commons.apache.orgCommons Documentation Team/author + /properties + body + +section name=Overview + p +a href=index.htmlCommons Net/a shares mailing lists with all the other +a href=http://commons.apache.org/components.html;Commons Components/a. +To make it easier for people to only read messages related to components they are interested in, +the convention in Commons is to prefix the subject line of messages with the component's name, +for example: +ul + li[net] Problem with the .../li +/ul + /p + p +Questions related to the usage of Commons Net should be posted to the +a href=http://mail-archives.apache.org/mod_mbox/commons-user/;User List/a. +br / +The a href=http://mail-archives.apache.org/mod_mbox/commons-dev/;Developer List/a +is for questions and discussion related to the development of Commons Net. +br / +Please do not cross-post; developers are also subscribed to the user list. + /p + p +strongNote:/strong please don't send patches or attachments to any of the mailing lists. +Patches are best handled via the a href=issue-tracking.htmlIssue Tracking/a system. +Otherwise, please upload the file to a public server and include the URL in the mail. + /p +/section + +section name=Commons Net Mailing Lists + p +strongPlease prefix the subject line of any messages for a href=index.htmlCommons Net/a +with i[net]/i/strong - ithanks!/i +br / +br / + /p + + table +tr + thName/th + thSubscribe/th + thUnsubscribe/th + thPost/th + thArchive/th + thOther Archives/th +/tr + +
svn commit: r1196006 - /commons/proper/net/trunk/pom.xml
Author: sebb
Date: Tue Nov 1 14:23:08 2011
New Revision: 1196006
URL: http://svn.apache.org/viewvc?rev=1196006view=rev
Log:
Updated to CP-22
Add Implementation-Build manifest headers
Modified:
commons/proper/net/trunk/pom.xml
Modified: commons/proper/net/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=1196006r1=1196005r2=1196006view=diff
==
--- commons/proper/net/trunk/pom.xml (original)
+++ commons/proper/net/trunk/pom.xml Tue Nov 1 14:23:08 2011
@@ -22,7 +22,7 @@
parent
groupIdorg.apache.commons/groupId
artifactIdcommons-parent/artifactId
-version21/version
+version22/version
/parent
modelVersion4.0.0/modelVersion
groupIdcommons-net/groupId
@@ -201,6 +201,7 @@ Supported protocols include: Echo, Finge
attribute
name=Implementation-Vendor value=${project.organization.name} /
attribute
name=Implementation-Version value=${project.version} /
attribute
name=Implementation-Vendor-Id value=org.apache /
+attribute name=Implementation-Build
value=${implementation.build}/
attribute name=X-Compile-Source-JDK
value=${maven.compile.source} /
attribute name=X-Compile-Target-JDK
value=${maven.compile.target} /
/manifest
@@ -219,6 +220,7 @@ Supported protocols include: Echo, Finge
attribute
name=Implementation-Vendor value=${project.organization.name} /
attribute
name=Implementation-Version value=${project.version} /
attribute
name=Implementation-Vendor-Id value=org.apache /
+attribute name=Implementation-Build
value=${implementation.build}/
attribute name=X-Compile-Source-JDK
value=${maven.compile.source} /
attribute name=X-Compile-Target-JDK
value=${maven.compile.target} /
/manifest
svn commit: r1196007 - /commons/proper/net/trunk/pom.xml
Author: sebb Date: Tue Nov 1 14:25:12 2011 New Revision: 1196007 URL: http://svn.apache.org/viewvc?rev=1196007view=rev Log: Update plugin versions Modified: commons/proper/net/trunk/pom.xml Modified: commons/proper/net/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=1196007r1=1196006r2=1196007view=diff == --- commons/proper/net/trunk/pom.xml (original) +++ commons/proper/net/trunk/pom.xml Tue Nov 1 14:25:12 2011 @@ -239,7 +239,7 @@ Supported protocols include: Echo, Finge plugin groupIdorg.codehaus.mojo/groupId artifactIdbuild-helper-maven-plugin/artifactId -version1.2/version +version1.5/version executions execution idattach-artifacts/id @@ -263,7 +263,7 @@ Supported protocols include: Echo, Finge plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-changes-plugin/artifactId -version2.4/version +version2.6/version configuration !-- Cannot use outputDirectory to place the file, as that affects the HTML output, so use relative path instead @@ -337,7 +337,7 @@ Supported protocols include: Echo, Finge plugin groupIdorg.codehaus.mojo/groupId artifactIdclirr-maven-plugin/artifactId -version2.2.2/version +version2.3/version configuration comparisonVersion2.2/comparisonVersion minSeverityinfo/minSeverity
svn commit: r1196034 - in /commons/proper/net/trunk/src: changes/changes.xml main/java/org/apache/commons/net/telnet/TelnetInputStream.java
Author: sebb Date: Tue Nov 1 14:55:00 2011 New Revision: 1196034 URL: http://svn.apache.org/viewvc?rev=1196034view=rev Log: NET-416 Increasing sub-negotiation message holder array size Modified: commons/proper/net/trunk/src/changes/changes.xml commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java Modified: commons/proper/net/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1196034r1=1196033r2=1196034view=diff == --- commons/proper/net/trunk/src/changes/changes.xml (original) +++ commons/proper/net/trunk/src/changes/changes.xml Tue Nov 1 14:55:00 2011 @@ -59,6 +59,9 @@ The action type attribute can be add,u release version=3.0.2-SNAPSHOT date=TBA description= TBA +action issue=NET-416 dev=sebb type=update +Increasing sub-negotiation message holder array size +/action action issue=NET-428 dev=sebb type=fix SubnetUtils throws ArrayIndexOutOfBoundsException for new SubnetUtils( 1.2.3.4/32 ).getInfo().getAllAddresses() /action Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java?rev=1196034r1=1196033r2=1196034view=diff == --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java Tue Nov 1 14:55:00 2011 @@ -55,7 +55,7 @@ final class TelnetInputStream extends Bu private IOException __ioException; /* TERMINAL-TYPE option (start)*/ -private final int __suboption[] = new int[256]; +private final int __suboption[] = new int[512]; private int __suboption_count = 0; /* TERMINAL-TYPE option (end)*/
svn commit: r1196051 - /commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamException.java
Author: sebb
Date: Tue Nov 1 15:22:59 2011
New Revision: 1196051
URL: http://svn.apache.org/viewvc?rev=1196051view=rev
Log:
No need to save exception locally
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamException.java
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamException.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamException.java?rev=1196051r1=1196050r2=1196051view=diff
==
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamException.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/io/CopyStreamException.java
Tue Nov 1 15:22:59 2011
@@ -32,7 +32,6 @@ public class CopyStreamException extends
private static final long serialVersionUID = -2602899129433221532L;
private final long totalBytesTransferred;
-private final IOException ioException;
/**
* Creates a new CopyStreamException instance.
@@ -46,8 +45,8 @@ public class CopyStreamException extends
IOException exception)
{
super(message);
+initCause(exception); // merge this into super() call once we need 1.6+
totalBytesTransferred = bytesTransferred;
-ioException = exception;
}
/**
@@ -67,6 +66,6 @@ public class CopyStreamException extends
*/
public IOException getIOException()
{
-return ioException;
+return (IOException) getCause(); // cast is OK because it was
initialised with an IOException
}
}
svn commit: r1196052 - /commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
Author: sebb
Date: Tue Nov 1 15:23:49 2011
New Revision: 1196052
URL: http://svn.apache.org/viewvc?rev=1196052view=rev
Log:
Javadoc fix
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java?rev=1196052r1=1196051r2=1196052view=diff
==
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
Tue Nov 1 15:23:49 2011
@@ -49,12 +49,12 @@ public class AuthenticatingSMTPClient ex
}
/**
- * Overloaded constructor that takes an encoding specification
- * @param encoding The encoding to use
+ * Overloaded constructor that takes a protocol specification
+ * @param protocol The encoding to use
* @throws NoSuchAlgorithmException
*/
-public AuthenticatingSMTPClient(String encoding) throws
NoSuchAlgorithmException {
-super(encoding);
+public AuthenticatingSMTPClient(String protocol) throws
NoSuchAlgorithmException {
+super(protocol);
}
/***
svn commit: r1196053 - /commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
Author: sebb
Date: Tue Nov 1 15:24:46 2011
New Revision: 1196053
URL: http://svn.apache.org/viewvc?rev=1196053view=rev
Log:
Javadoc fix
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java?rev=1196053r1=1196052r2=1196053view=diff
==
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java
Tue Nov 1 15:24:46 2011
@@ -50,7 +50,7 @@ public class AuthenticatingSMTPClient ex
/**
* Overloaded constructor that takes a protocol specification
- * @param protocol The encoding to use
+ * @param protocol The protocol to use
* @throws NoSuchAlgorithmException
*/
public AuthenticatingSMTPClient(String protocol) throws
NoSuchAlgorithmException {
svn commit: r1196055 - in /commons/proper/net/trunk/src: changes/changes.xml main/java/org/apache/commons/net/ftp/FTPClient.java
Author: sebb
Date: Tue Nov 1 15:26:51 2011
New Revision: 1196055
URL: http://svn.apache.org/viewvc?rev=1196055view=rev
Log:
NET-425 _openDataConnection_, __storeFile, and __storeFileStream should be
protected and take String for FTP command.
Modified:
commons/proper/net/trunk/src/changes/changes.xml
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Modified: commons/proper/net/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1196055r1=1196054r2=1196055view=diff
==
--- commons/proper/net/trunk/src/changes/changes.xml (original)
+++ commons/proper/net/trunk/src/changes/changes.xml Tue Nov 1 15:26:51 2011
@@ -59,6 +59,9 @@ The action type attribute can be add,u
release version=3.0.2-SNAPSHOT date=TBA description=
TBA
+action issue=NET-425 dev=sebb type=add
+_openDataConnection_, __storeFile, and __storeFileStream should be
protected and take String for FTP command.
+/action
action issue=NET-416 dev=sebb type=update
Increasing sub-negotiation message holder array size
/action
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=1196055r1=1196054r2=1196055view=diff
==
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Tue Nov 1 15:26:51 2011
@@ -545,6 +545,12 @@ implements Configurable
private boolean __storeFile(int command, String remote, InputStream local)
throws IOException
{
+ return _storeFile(FTPCommand.getCommand(command), remote, local);
+}
+
+protected boolean _storeFile(String command, String remote, InputStream
local)
+throws IOException
+{
OutputStream output;
Socket socket;
@@ -588,6 +594,12 @@ implements Configurable
private OutputStream __storeFileStream(int command, String remote)
throws IOException
{
+ return _storeFileStream(FTPCommand.getCommand(command), remote);
+}
+
+protected OutputStream _storeFileStream(String command, String remote)
+throws IOException
+{
OutputStream output;
Socket socket;
@@ -633,6 +645,12 @@ implements Configurable
protected Socket _openDataConnection_(int command, String arg)
throws IOException
{
+ return _openDataConnection_(FTPCommand.getCommand(command), arg);
+}
+
+protected Socket _openDataConnection_(String command, String arg)
+throws IOException
+{
Socket socket;
if (__dataConnectionMode != ACTIVE_LOCAL_DATA_CONNECTION_MODE
svn commit: r1196056 - /commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Author: sebb Date: Tue Nov 1 15:27:24 2011 New Revision: 1196056 URL: http://svn.apache.org/viewvc?rev=1196056view=rev Log: Javadoc fix Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=1196056r1=1196055r2=1196056view=diff == --- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original) +++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java Tue Nov 1 15:27:24 2011 @@ -632,7 +632,7 @@ implements Configurable * an argument before establishing the data connection. Active * mode connections also cause a local PORT command to be issued. * p - * @param command The text representation of the FTP command to send. + * @param command The int representation of the FTP command to send. * @param arg The arguments to the FTP command. If this parameter is * set to null, then the command is sent with no argument. * @return A Socket corresponding to the established data connection.
svn commit: r1196058 - /commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Author: sebb
Date: Tue Nov 1 15:27:53 2011
New Revision: 1196058
URL: http://svn.apache.org/viewvc?rev=1196058view=rev
Log:
Javadoc fix
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Modified:
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=1196058r1=1196057r2=1196058view=diff
==
---
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Tue Nov 1 15:27:53 2011
@@ -648,6 +648,24 @@ implements Configurable
return _openDataConnection_(FTPCommand.getCommand(command), arg);
}
+/**
+ * Establishes a data connection with the FTP server, returning
+ * a Socket for the connection if successful. If a restart
+ * offset has been set with {@link #setRestartOffset(long)},
+ * a REST command is issued to the server with the offset as
+ * an argument before establishing the data connection. Active
+ * mode connections also cause a local PORT command to be issued.
+ * p
+ * @param command The text representation of the FTP command to send.
+ * @param arg The arguments to the FTP command. If this parameter is
+ * set to null, then the command is sent with no argument.
+ * @return A Socket corresponding to the established data connection.
+ * Null is returned if an FTP protocol error is reported at
+ * any point during the establishment and initialization of
+ * the connection.
+ * @exception IOException If an I/O error occurs while either sending a
+ * command to the server or receiving a reply from the server.
+ */
protected Socket _openDataConnection_(String command, String arg)
throws IOException
{
svn commit: r1196060 - /commons/proper/net/trunk/src/changes/changes.xml
Author: sebb Date: Tue Nov 1 15:29:14 2011 New Revision: 1196060 URL: http://svn.apache.org/viewvc?rev=1196060view=rev Log: Next version will most likely be 3.1 Modified: commons/proper/net/trunk/src/changes/changes.xml Modified: commons/proper/net/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1196060r1=1196059r2=1196060view=diff == --- commons/proper/net/trunk/src/changes/changes.xml (original) +++ commons/proper/net/trunk/src/changes/changes.xml Tue Nov 1 15:29:14 2011 @@ -56,7 +56,7 @@ The action type attribute can be add,u -- body -release version=3.0.2-SNAPSHOT date=TBA description= +release version=3.1-SNAPSHOT date=TBA description= TBA action issue=NET-425 dev=sebb type=add
svn commit: r1196070 - /commons/proper/net/trunk/pom.xml
Author: sebb Date: Tue Nov 1 15:54:58 2011 New Revision: 1196070 URL: http://svn.apache.org/viewvc?rev=1196070view=rev Log: Latest version of JUnit Modified: commons/proper/net/trunk/pom.xml Modified: commons/proper/net/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=1196070r1=1196069r2=1196070view=diff == --- commons/proper/net/trunk/pom.xml (original) +++ commons/proper/net/trunk/pom.xml Tue Nov 1 15:54:58 2011 @@ -115,7 +115,7 @@ Supported protocols include: Echo, Finge dependency groupIdjunit/groupId artifactIdjunit/artifactId -version4.8.2/version +version4.10/version scopetest/scope /dependency /dependencies
svn commit: r1196226 - /commons/proper/compress/tags/COMPRESS_1.3/
Author: bodewig Date: Tue Nov 1 19:22:19 2011 New Revision: 1196226 URL: http://svn.apache.org/viewvc?rev=1196226view=rev Log: RC2 it is Added: commons/proper/compress/tags/COMPRESS_1.3/ (props changed) - copied from r1196225, commons/proper/compress/tags/COMPRESS_1.3_RC2/ Propchange: commons/proper/compress/tags/COMPRESS_1.3/ -- --- subclipse:tags (added) +++ subclipse:tags Tue Nov 1 19:22:19 2011 @@ -0,0 +1 @@ +774629,commons-compress-1.0,/commons/proper/compress/tags/commons-compress-1.0,tag Propchange: commons/proper/compress/tags/COMPRESS_1.3/ -- --- svn:ignore (added) +++ svn:ignore Tue Nov 1 19:22:19 2011 @@ -0,0 +1,6 @@ +target +*.iml +*.ipr +*.iws +.* +maven-eclipse.xml Propchange: commons/proper/compress/tags/COMPRESS_1.3/ -- svn:mergeinfo = /commons/proper/compress/branches/zip64:1149597-1152684
svn commit: r1196250 [1/3] - in /commons/sandbox/nabla/trunk/src: main/uml/ site/resources/images/
Author: luc Date: Tue Nov 1 20:06:08 2011 New Revision: 1196250 URL: http://svn.apache.org/viewvc?rev=1196250view=rev Log: Updated UML class diagram and added a few new diagrams. Added: commons/sandbox/nabla/trunk/src/main/uml/ commons/sandbox/nabla/trunk/src/main/uml/class-diagram-forward.png (with props) commons/sandbox/nabla/trunk/src/main/uml/class-diagram-forward.svg (with props) commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-1.png (with props) commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-1.svg (with props) commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-2.png (with props) commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-2.svg (with props) Modified: commons/sandbox/nabla/trunk/src/site/resources/images/public-API.png Added: commons/sandbox/nabla/trunk/src/main/uml/class-diagram-forward.png URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/uml/class-diagram-forward.png?rev=1196250view=auto == Binary file - no diff available. Propchange: commons/sandbox/nabla/trunk/src/main/uml/class-diagram-forward.png -- svn:mime-type = image/png Added: commons/sandbox/nabla/trunk/src/main/uml/class-diagram-forward.svg URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/uml/class-diagram-forward.svg?rev=1196250view=auto == --- commons/sandbox/nabla/trunk/src/main/uml/class-diagram-forward.svg (added) +++ commons/sandbox/nabla/trunk/src/main/uml/class-diagram-forward.svg Tue Nov 1 20:06:08 2011 @@ -0,0 +1,565 @@ +?xml version=1.0 encoding=UTF-8? +svg stroke-dasharray=none shape-rendering=auto +font-family='Dialog' width=926 text-rendering=auto +fill-opacity=1 color-interpolation=auto color-rendering=auto +font-size=12 fill=black stroke=black image-rendering=auto +stroke-miterlimit=10 stroke-linecap=square +stroke-linejoin=miter font-style=normal height=710 +stroke-width=1 stroke-dashoffset=0 font-weight=normal stroke-opacity=1 +!--Generated by the Batik Graphics2D SVG Generator-- +defs id=genericDefs/ +g +defs id=defs1 +clipPath clipPathUnits=userSpaceOnUse id=clipPath1 +path d=M-1 -1 L926 -1 L926 710 L-1 710 L-1 -1 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath2 +path d=M5 5 L76 5 L76 22 L5 22 L5 5 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath3 +path d=M76 5 L125 5 L125 22 L76 22 L76 5 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath4 +path d=M117 160 L549 160 L549 227 L117 227 L117 160 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath5 +path d=M190 162 L475 162 L475 179 L190 179 L190 162 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath6 +path d=M119 177 L547 177 L547 189 L119 189 L119 177 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath7 +path d=M120 190 L133 190 L133 207 L120 207 L120 190 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath8 +path d=M133 190 L292 190 L292 207 L133 207 L133 190 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath9 +path d=M292 190 L418 190 L418 207 L292 207 L292 190 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath10 +path d=M120 207 L133 207 L133 224 L120 224 L120 207 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath11 +path d=M133 207 L212 207 L212 224 L133 224 L133 207 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath12 +path d=M212 207 L349 207 L349 224 L212 224 L212 207 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath13 +path d=M119 187 L547 187 L547 225 L119 225 L119 187 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath14 +path d=M149 52 L581 52 L581 130 L149 130 L149 52 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath15 +path d=M321 54 L409 54 L409 69 L321 69 L321 54 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath16 +path d=M288 69 L442 69 L442 84 L288 84 L288 69 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath17 +path d=M332 84 L398 84 L398 99 L332 99
svn commit: r1196250 [3/3] - in /commons/sandbox/nabla/trunk/src: main/uml/ site/resources/images/
Added: commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-2.svg URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-2.svg?rev=1196250view=auto == --- commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-2.svg (added) +++ commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-2.svg Tue Nov 1 20:06:08 2011 @@ -0,0 +1,571 @@ +?xml version=1.0 encoding=UTF-8? +svg stroke-dasharray=none shape-rendering=auto +font-family='Dialog' width=1011 text-rendering=auto +fill-opacity=1 color-interpolation=auto color-rendering=auto +font-size=12 fill=black stroke=black image-rendering=auto +stroke-miterlimit=10 stroke-linecap=square +stroke-linejoin=miter font-style=normal height=621 +stroke-width=1 stroke-dashoffset=0 font-weight=normal stroke-opacity=1 +!--Generated by the Batik Graphics2D SVG Generator-- +defs id=genericDefs/ +g +defs id=defs1 +clipPath clipPathUnits=userSpaceOnUse id=clipPath1 +path d=M-1 -1 L954 -1 L954 621 L-1 621 L-1 -1 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath2 +path d=M5 5 L76 5 L76 22 L5 22 L5 5 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath3 +path d=M76 5 L113 5 L113 22 L76 22 L76 5 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath4 +path d=M32 59 L69 59 L69 80 L32 80 L32 59 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath5 +path d=M35 62 L65 62 L65 79 L35 79 L35 62 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath6 +path d=M32 78 L604 78 L604 429 L32 429 L32 78 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath7 +path d=M93 334 L525 334 L525 397 L93 397 L93 334 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath8 +path d=M265 336 L353 336 L353 351 L265 351 L265 336 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath9 +path d=M232 351 L386 351 L386 366 L232 366 L232 351 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath10 +path d=M95 364 L523 364 L523 376 L95 376 L95 364 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath11 +path d=M96 377 L109 377 L109 394 L96 394 L96 377 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath12 +path d=M109 377 L188 377 L188 394 L109 394 L109 377 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath13 +path d=M188 377 L511 377 L511 394 L188 394 L188 377 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath14 +path d=M95 374 L523 374 L523 395 L95 395 L95 374 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath15 +path d=M54 102 L348 102 L348 203 L54 203 L54 102 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath16 +path d=M145 104 L257 104 L257 121 L145 121 L145 104 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath17 +path d=M56 119 L346 119 L346 131 L56 131 L56 119 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath18 +path d=M57 132 L70 132 L70 149 L57 149 L57 132 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath19 +path d=M70 132 L148 132 L148 149 L70 149 L70 132 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath20 +path d=M148 132 L327 132 L327 149 L148 149 L148 132 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath21 +path d=M57 149 L70 149 L70 166 L57 166 L57 149 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath22 +path d=M70 149 L155 149 L155 166 L70 166 L70 149 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath23 +path d=M155 149 L334 149 L334 166 L155 166 L155 149 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath24 +path d=M57 166 L70 166 L70 183 L57 183 L57 166 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath25 +path d=M70 166 L128 166 L128 183 L70 183 L70 166 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath26 +
svn commit: r1196250 [2/3] - in /commons/sandbox/nabla/trunk/src: main/uml/ site/resources/images/
Added: commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-1.svg URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-1.svg?rev=1196250view=auto == --- commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-1.svg (added) +++ commons/sandbox/nabla/trunk/src/main/uml/class-diagram-nabla-1.svg Tue Nov 1 20:06:08 2011 @@ -0,0 +1,933 @@ +?xml version=1.0 encoding=UTF-8? +svg stroke-dasharray=none shape-rendering=auto +font-family='Dialog' width=1016 text-rendering=auto +fill-opacity=1 color-interpolation=auto color-rendering=auto +font-size=12 fill=black stroke=black image-rendering=auto +stroke-miterlimit=10 stroke-linecap=square +stroke-linejoin=miter font-style=normal height=909 +stroke-width=1 stroke-dashoffset=0 font-weight=normal stroke-opacity=1 +!--Generated by the Batik Graphics2D SVG Generator-- +defs id=genericDefs/ +g +defs id=defs1 +clipPath clipPathUnits=userSpaceOnUse id=clipPath1 +path d=M-1 -1 L958 -1 L958 909 L-1 909 L-1 -1 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath2 +path d=M5 5 L76 5 L76 22 L5 22 L5 5 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath3 +path d=M76 5 L113 5 L113 22 L76 22 L76 5 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath4 +path d=M33 69 L70 69 L70 90 L33 90 L33 69 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath5 +path d=M36 72 L66 72 L66 89 L36 89 L36 72 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath6 +path d=M33 88 L623 88 L623 451 L33 451 L33 88 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath7 +path d=M55 327 L487 327 L487 390 L55 390 L55 327 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath8 +path d=M227 329 L315 329 L315 344 L227 344 L227 329 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath9 +path d=M194 344 L348 344 L348 359 L194 359 L194 344 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath10 +path d=M57 357 L485 357 L485 369 L57 369 L57 357 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath11 +path d=M58 370 L71 370 L71 387 L58 387 L58 370 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath12 +path d=M71 370 L150 370 L150 387 L71 387 L71 370 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath13 +path d=M150 370 L473 370 L473 387 L150 387 L150 370 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath14 +path d=M57 367 L485 367 L485 388 L57 388 L57 367 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath15 +path d=M52 106 L346 106 L346 207 L52 207 L52 106 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath16 +path d=M143 108 L255 108 L255 125 L143 125 L143 108 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath17 +path d=M54 123 L344 123 L344 135 L54 135 L54 123 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath18 +path d=M55 136 L68 136 L68 153 L55 153 L55 136 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath19 +path d=M68 136 L146 136 L146 153 L68 153 L68 136 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath20 +path d=M146 136 L325 136 L325 153 L146 153 L146 136 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath21 +path d=M55 153 L68 153 L68 170 L55 170 L55 153 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath22 +path d=M68 153 L153 153 L153 170 L68 170 L68 153 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath23 +path d=M153 153 L332 153 L332 170 L153 170 L153 153 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath24 +path d=M55 170 L68 170 L68 187 L55 187 L55 170 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath25 +path d=M68 170 L126 170 L126 187 L68 187 L68 170 Z/ +/clipPath +clipPath clipPathUnits=userSpaceOnUse id=clipPath26 +
svn commit: r1196262 - /commons/proper/daemon/trunk/src/native/unix/support/apjava.m4
Author: mturk
Date: Tue Nov 1 20:35:39 2011
New Revision: 1196262
URL: http://svn.apache.org/viewvc?rev=1196262view=rev
Log:
DAEMON-220: Drop JDK guess
Modified:
commons/proper/daemon/trunk/src/native/unix/support/apjava.m4
Modified: commons/proper/daemon/trunk/src/native/unix/support/apjava.m4
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/support/apjava.m4?rev=1196262r1=1196261r2=1196262view=diff
==
--- commons/proper/daemon/trunk/src/native/unix/support/apjava.m4 (original)
+++ commons/proper/daemon/trunk/src/native/unix/support/apjava.m4 Tue Nov 1
20:35:39 2011
@@ -44,53 +44,13 @@ AC_DEFUN([AP_FIND_JAVA],[
then
java_bin=`dirname $java_prog`
java_top=`dirname $java_bin`
- if test -d $java_top/include
+ if test -f $java_top/include/jni.h
then
JAVA_HOME=$java_top
AC_MSG_RESULT([${java_top}])
fi
fi
fi
- if test x$JAVA_HOME = x
- then
-# Oh well, nobody set JAVA_HOME, have to guess
-for java_prefix in /usr/local /usr/local/lib /usr /usr/lib /usr/lib/jvm
/opt /usr/java /System/Library/Frameworks/JavaVM.framework/Versions/
-do
- for subversion in 1.9 1.8 1.7 1.6 1.5 1.4 1.3 1.2
- do
-for variant in IBMJava2- java java- jdk jdk- CurrentJDK
-do
- for guess in $java_prefix/$variant$subversion*
- do
-if test -d ${guess}/bin test -d ${guess}/include
-then
- JAVA_HOME=${guess}
- AC_MSG_RESULT([${guess}])
- break
-fi
-if test -d ${guess}/Commands test -d ${guess}/Headers
-then
- JAVA_HOME=$guess
- AC_MSG_RESULT([${guess}])
- break
-fi
- done
- if test -n $JAVA_HOME
- then
-break;
- fi
-done
-if test -n $JAVA_HOME
-then
- break;
-fi
- done
- if test -n $JAVA_HOME
- then
-break;
- fi
-done
- fi
if test x$JAVA_HOME = x
then
AC_MSG_ERROR([Java Home not defined. Rerun with --with-java=[...]
parameter])
@@ -122,6 +82,7 @@ AC_DEFUN([AP_FIND_JAVA_OS],[
JAVA_OS=`dirname $f`
JAVA_OS=`basename $JAVA_OS`
echo $JAVA_OS
+break
fi
done
if test x$JAVA_OS = xNONE; then
svn commit: r1196265 - in /commons/proper/daemon/trunk/src/native/unix: CHANGES.txt native/arguments.c native/arguments.h native/help.c
Author: mturk
Date: Tue Nov 1 20:43:52 2011
New Revision: 1196265
URL: http://svn.apache.org/viewvc?rev=1196265view=rev
Log:
revert procname visiblilty change
Modified:
commons/proper/daemon/trunk/src/native/unix/CHANGES.txt
commons/proper/daemon/trunk/src/native/unix/native/arguments.c
commons/proper/daemon/trunk/src/native/unix/native/arguments.h
commons/proper/daemon/trunk/src/native/unix/native/help.c
Modified: commons/proper/daemon/trunk/src/native/unix/CHANGES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/CHANGES.txt?rev=1196265r1=1196264r2=1196265view=diff
==
--- commons/proper/daemon/trunk/src/native/unix/CHANGES.txt (original)
+++ commons/proper/daemon/trunk/src/native/unix/CHANGES.txt Tue Nov 1 20:43:52
2011
@@ -5,7 +5,6 @@ Changes with 1.0.8
* Better detection of JDK (DAEMON-220)
* Use CPPFLAGS in makefile (DAEMON-223)
* Add -umask parameter (DAEMON-221)
- * Make sure -procname is visible only on Linux (DAEMON-222)
* Add /etc/alternatives to the location search (DAEMON-224)
Changes with 1.0.7
Modified: commons/proper/daemon/trunk/src/native/unix/native/arguments.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/arguments.c?rev=1196265r1=1196264r2=1196265view=diff
==
--- commons/proper/daemon/trunk/src/native/unix/native/arguments.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/arguments.c Tue Nov 1
20:43:52 2011
@@ -170,9 +170,7 @@ static arg_data *parse(int argc, char *a
args-outfile = /dev/null; /* Swallow by default */
args-errfile = /dev/null; /* Swallow by default */
args-redirectstdin = true;/* Redirect stdin to /dev/null by default */
-#ifdef OS_LINUX
args-procname = jsvc.exec;
-#endif
#ifndef JSVC_UMASK
args-umask = 0077;
#else
@@ -377,7 +375,6 @@ static arg_data *parse(int argc, char *a
else if (!strcmp(argv[x], -disablesystemassertions)) {
args-opts[args-onum++] = strdup(argv[x]);
}
-#ifdef OS_LINUX
else if (!strcmp(argv[x], -procname)) {
args-procname = optional(argc, argv, x++);
if (args-procname == NULL) {
@@ -385,7 +382,6 @@ static arg_data *parse(int argc, char *a
return NULL;
}
}
-#endif
else if (!strncmp(argv[x], -agentlib:, 10)) {
args-opts[args-onum++] = strdup(argv[x]);
}
Modified: commons/proper/daemon/trunk/src/native/unix/native/arguments.h
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/arguments.h?rev=1196265r1=1196264r2=1196265view=diff
==
--- commons/proper/daemon/trunk/src/native/unix/native/arguments.h (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/arguments.h Tue Nov 1
20:43:52 2011
@@ -69,10 +69,8 @@ typedef struct {
char *outfile;
/** Destination for stderr */
char *errfile;
-#ifdef OS_LINUX
-/** Program name for Linux **/
+/** Program name **/
char *procname;
-#endif
/** Whether to redirect stdin to /dev/null or not. Defaults to true **/
bool redirectstdin;
/** What umask to use **/
Modified: commons/proper/daemon/trunk/src/native/unix/native/help.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/help.c?rev=1196265r1=1196264r2=1196265view=diff
==
--- commons/proper/daemon/trunk/src/native/unix/native/help.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/help.c Tue Nov 1
20:43:52 2011
@@ -89,10 +89,8 @@ void help(home_data *data)
printf(load native agent library by full pathname\n);
printf(-javaagent:jarpath[=options]\n);
printf(load Java programming language agent, see
java.lang.instrument\n);
-#ifdef OS_LINUX
printf(-procname procname\n);
printf(use the specified process name\n);
-#endif
printf(-wait waittime\n);
printf(wait waittime seconds for the service to start\n);
printf(waittime should multiple of 10 (min=10)\n);
svn commit: r1196276 - /commons/proper/daemon/trunk/src/native/unix/INSTALL.txt
Author: mturk Date: Tue Nov 1 21:09:11 2011 New Revision: 1196276 URL: http://svn.apache.org/viewvc?rev=1196276view=rev Log: Update INSTALL.txt with new params Modified: commons/proper/daemon/trunk/src/native/unix/INSTALL.txt Modified: commons/proper/daemon/trunk/src/native/unix/INSTALL.txt URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/INSTALL.txt?rev=1196276r1=1196275r2=1196276view=diff == --- commons/proper/daemon/trunk/src/native/unix/INSTALL.txt (original) +++ commons/proper/daemon/trunk/src/native/unix/INSTALL.txt Tue Nov 1 21:09:11 2011 @@ -22,17 +22,19 @@ or export JAVA_HOME ./configure -or (when using gcj (use fastjar for jar)) - JAVAC=gcj; export JAVAC - JAVACFLAGS=-c; export JAVACFLAGS - ./configure - Note: On Mac OS X dir is /System/Library/Frameworks/JavaVM.framework/Home. +Depending on your JDK layout, configure might fail to find the JNI +machine dependant include file (jni_md.h). If that's the case use the +--with-os-type=subdir parameter where subdir points to the directory +within JDK include directory containing jni_md.h file. + + If your operating system is supported, configure will go thru cleanly, otherwise it will report an error (please send us the details of your -OS/JDK, or a patch against the sources). To build the binaries and -libraries simply do: +OS/JDK, or a patch against the sources). + +To build the binaries and libraries simply do: make
svn commit: r1196400 - /commons/proper/daemon/trunk/RELEASE-NOTES.txt
Author: sebb Date: Tue Nov 1 23:54:42 2011 New Revision: 1196400 URL: http://svn.apache.org/viewvc?rev=1196400view=rev Log: DAEMON-220 fixed for 1.0.8 Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/RELEASE-NOTES.txt?rev=1196400r1=1196399r2=1196400view=diff == --- commons/proper/daemon/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/daemon/trunk/RELEASE-NOTES.txt Tue Nov 1 23:54:42 2011 @@ -80,7 +80,7 @@ NEW FEATURES: BUG FIXES: -1.0.8: DAEMON-222, DAEMON-223, DAEMON-224 +1.0.8: DAEMON-220, DAEMON-222, DAEMON-223, DAEMON-224 1.0.7: DAEMON-211, DAEMON-214
svn commit: r1196417 - /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/FileSystemExceptionTest.java
Author: ggregory
Date: Wed Nov 2 00:59:54 2011
New Revision: 1196417
URL: http://svn.apache.org/viewvc?rev=1196417view=rev
Log:
Convert to JUnit 4.
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/FileSystemExceptionTest.java
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/FileSystemExceptionTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/FileSystemExceptionTest.java?rev=1196417r1=1196416r2=1196417view=diff
==
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/FileSystemExceptionTest.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/FileSystemExceptionTest.java
Wed Nov 2 00:59:54 2011
@@ -16,7 +16,9 @@
*/
package org.apache.commons.vfs2;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
/**
@@ -24,11 +26,12 @@ import junit.framework.TestCase;
*
* @author Jouml;rg Schaible
*/
-public class FileSystemExceptionTest extends TestCase {
+public class FileSystemExceptionTest {
/**
* Tests a {@link FileSystemException} containing info with a URL
containing a complete
* basic authentication.
*/
+@Test
public void testMasksPasswordOfUrlsWithBasicAuthentication() {
final FileSystemException fse = new FileSystemException(
vfs.provider/rename.error, new String[]{
@@ -42,6 +45,7 @@ public class FileSystemExceptionTest ext
* Tests a {@link FileSystemException} containing info with a URL
containing only the user
* information.
*/
+@Test
public void testDoesNotModifyUrlsWithoutPassword() {
final FileSystemException fse = new FileSystemException(
vfs.provider/delete.error, new
String[]{http://f...@junit.org/test.bin});
@@ -52,6 +56,7 @@ public class FileSystemExceptionTest ext
* Tests a {@link FileSystemException} containing info with a nested URL
containing a
* complete basic authentication.
*/
+@Test
public void testProperDetectionOfUrl() {
final FileSystemException fse = new FileSystemException(
vfs.provider/delete.error, new
String[]{zip:http://foo:b...@junit.org/test.bin});
svn commit: r1196419 - /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java
Author: ggregory
Date: Wed Nov 2 01:10:45 2011
New Revision: 1196419
URL: http://svn.apache.org/viewvc?rev=1196419view=rev
Log:
Convert to JUnit 4.
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java?rev=1196419r1=1196418r2=1196419view=diff
==
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/ram/test/CustomRamProviderTest.java
Wed Nov 2 01:10:45 2011
@@ -16,9 +16,10 @@
*/
package org.apache.commons.vfs2.provider.ram.test;
-import java.io.OutputStream;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-import junit.framework.TestCase;
+import java.io.OutputStream;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
@@ -26,6 +27,9 @@ import org.apache.commons.vfs2.FileSyste
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.provider.ram.RamFileProvider;
import org.apache.commons.vfs2.provider.ram.RamFileSystemConfigBuilder;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* Custom tests
@@ -33,7 +37,7 @@ import org.apache.commons.vfs2.provider.
* @author edgar poce
*
*/
-public class CustomRamProviderTest extends TestCase
+public class CustomRamProviderTest
{
DefaultFileSystemManager manager;
@@ -43,11 +47,9 @@ public class CustomRamProviderTest exten
FileSystemOptions defaultRamFs = new FileSystemOptions();
-@Override
-protected void setUp() throws Exception
+@Before
+public void setUp() throws Exception
{
-super.setUp();
-
manager = new DefaultFileSystemManager();
manager.addProvider(ram, new RamFileProvider());
manager.init();
@@ -57,13 +59,13 @@ public class CustomRamProviderTest exten
RamFileSystemConfigBuilder.getInstance().setMaxSize(smallSized, 10);
}
-@Override
-protected void tearDown() throws Exception
+@After
+public void tearDown() throws Exception
{
-super.tearDown();
manager.close();
}
+@Test
public void testSmallFS() throws Exception
{
@@ -113,6 +115,7 @@ public class CustomRamProviderTest exten
*
* @throws FileSystemException
*/
+@Test
public void testRootFolderExists() throws FileSystemException {
FileObject root = manager.resolveFile(ram:///, defaultRamFs);
assertTrue(root.getType().hasChildren());
svn commit: r1196421 - /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/LargeTarTestCase.java
Author: ggregory
Date: Wed Nov 2 01:12:48 2011
New Revision: 1196421
URL: http://svn.apache.org/viewvc?rev=1196421view=rev
Log:
Convert to JUnit 4.
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/LargeTarTestCase.java
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/LargeTarTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/LargeTarTestCase.java?rev=1196421r1=1196420r2=1196421view=diff
==
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/LargeTarTestCase.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/tar/test/LargeTarTestCase.java
Wed Nov 2 01:12:48 2011
@@ -16,6 +16,10 @@
*/
package org.apache.commons.vfs2.provider.tar.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
@@ -25,8 +29,6 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
@@ -39,9 +41,11 @@ import org.apache.commons.vfs2.cache.Sof
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider;
import org.apache.commons.vfs2.provider.tar.TarFileProvider;
+import org.junit.Before;
+import org.junit.Test;
//@SuppressWarnings(nls)
-public class LargeTarTestCase extends TestCase {
+public class LargeTarTestCase {
private final static String baseDir = target/test-classes/test-data/;
private DefaultFileSystemManager manager;
@@ -49,7 +53,7 @@ public class LargeTarTestCase extends Te
private final static String largeFileName = largefile;
- @Override
+ @Before
public void setUp() throws Exception {
manager = new DefaultFileSystemManager();
@@ -64,6 +68,7 @@ public void setUp() throws Exception {
createLargeFile(largeFilePath, largeFileName);
}
+ @Test
public void testLargeFile() throws Exception {
File realFile = new File(largeFilePath + largeFileName + .tar.gz);
svn commit: r1196423 - /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
Author: ggregory
Date: Wed Nov 2 01:16:00 2011
New Revision: 1196423
URL: http://svn.apache.org/viewvc?rev=1196423view=rev
Log:
Convert to JUnit 4.
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=1196423r1=1196422r2=1196423view=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 01:16:00 2011
@@ -16,31 +16,36 @@
*/
package org.apache.commons.vfs2.util;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.lang.reflect.InvocationTargetException;
-import junit.framework.TestCase;
-
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.impl.StandardFileSystemManager;
import org.apache.commons.vfs2.provider.http.HttpFileSystemConfigBuilder;
import org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder;
import org.apache.commons.vfs2.provider.sftp.TrustEveryoneUserInfo;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* Some tests for the DelegatingFileSystemOptionsBuilder
*
* @author a href=mailto:ima...@apache.org;Mario Ivankovits/a
*/
-public class DelegatingFileSystemOptionsBuilderTest extends TestCase
+public class DelegatingFileSystemOptionsBuilderTest
{
private StandardFileSystemManager fsm = null;
-@Override
-protected void setUp() throws Exception
+@Before
+public void setUp() throws Exception
{
-super.setUp();
// get a full blown, fully functional manager
fsm = new StandardFileSystemManager();
@@ -48,17 +53,16 @@ public class DelegatingFileSystemOptions
}
-@Override
-protected void tearDown() throws Exception
+@After
+public void tearDown() throws Exception
{
if (fsm != null)
{
fsm.close();
}
-
-super.tearDown();
}
+@Test
public void testDelegatingGood() throws Throwable
{
final String[] identityPaths = new String[]
@@ -90,6 +94,7 @@ public class DelegatingFileSystemOptions
}
}
+@Test
public void testDelegatingBad() throws Throwable
{
FileSystemOptions opts = new FileSystemOptions();
@@ -122,6 +127,7 @@ public class DelegatingFileSystemOptions
webdav, http, ftp, file, zip, tar, tgz, bz2, gz,
jar, tmp, ram
};
+@Test
public void testConfiguration() throws Exception
{
for (int i=0; i schemes.length; ++i)
svn commit: r1196424 - /commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/EncryptDecryptTest.java
Author: ggregory
Date: Wed Nov 2 01:16:42 2011
New Revision: 1196424
URL: http://svn.apache.org/viewvc?rev=1196424view=rev
Log:
Convert to JUnit 4.
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/EncryptDecryptTest.java
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/EncryptDecryptTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/EncryptDecryptTest.java?rev=1196424r1=1196423r2=1196424view=diff
==
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/EncryptDecryptTest.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/util/EncryptDecryptTest.java
Wed Nov 2 01:16:42 2011
@@ -16,14 +16,17 @@
*/
package org.apache.commons.vfs2.util;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
/**
*
*/
-public class EncryptDecryptTest extends TestCase
+public class EncryptDecryptTest
{
+@Test
public void testEncryptDecrypt() throws Exception
{
String source = Qryp2!ttpR59;
