svn commit: r544992 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Author: rwinston
Date: Wed Jun 6 16:41:10 2007
New Revision: 544992
URL: http://svn.apache.org/viewvc?view=revrev=544992
Log:
NET-158: Try to handle intermediate return code during authentication
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?view=diffrev=544992r1=544991r2=544992
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Wed Jun 6 16:41:10 2007
@@ -664,7 +664,16 @@
if (!FTPReply.isPositiveIntermediate(_replyCode))
return false;
-return FTPReply.isPositiveCompletion(pass(password));
+int replyCode = pass(password);
+boolean replyOk = FTPReply.isPositiveCompletion(replyCode);
+
+// Work around stupid servers that send a 451 here
+if (!replyOk (replyCode == FTPReply.ACTION_ABORTED)) {
+ replyCode = getReply();
+ replyOk = FTPReply.isPositiveCompletion(replyCode);
+}
+
+return replyOk;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r544994 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
Author: rwinston
Date: Wed Jun 6 16:50:21 2007
New Revision: 544994
URL: http://svn.apache.org/viewvc?view=revrev=544994
Log:
Rollback
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java?view=diffrev=544994r1=544993r2=544994
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
Wed Jun 6 16:50:21 2007
@@ -33,7 +33,7 @@
import org.apache.commons.net.SocketClient;
/***
- * FTP provides basic functionality necessary to implement your
+ * FTP provides the basic the functionality necessary to implement your
* own FTP client. It extends org.apache.commons.net.SocketClient since
* extending TelnetClient was causing unwanted behavior (like connections
* that did not time out properly).
@@ -311,7 +311,8 @@
// returning too soon after encountering a naked CR or some
other
// anomaly.
}
-while ((line.length() = 4 || line.charAt(3) == '-' ||
!(line.substring(0,3).matches(\\d{3};
+while (!(line.length() = 4 line.charAt(3) != '-'
+ Character.isDigit(line.charAt(0;
// This is too strong a condition because of non-conforming ftp
// servers like ftp.funet.fi which sent 226 as the last line of a
// 426 multi-line reply in response to ls /. We relax the
condition to
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r544998 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
Author: rwinston Date: Wed Jun 6 16:55:28 2007 New Revision: 544998 URL: http://svn.apache.org/viewvc?view=revrev=544998 Log: NET-158 Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diffrev=544998r1=544997r2=544998 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Wed Jun 6 16:55:28 2007 @@ -23,6 +23,9 @@ body release version=2.0 date= description=Java 5.0 release + action dev=rwinston type=update issue=NET-158 + Added a workaround for intermediate 451 code in authentication. + /action action dev=rwinston type=update issue=NET-159 Add a setDateRollbackPermitted() method to disable rolling back dates by 1 year when only short date format is - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r543963 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
Author: rwinston Date: Sun Jun 3 12:05:55 2007 New Revision: 543963 URL: http://svn.apache.org/viewvc?view=revrev=543963 Log: Remove repo Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?view=diffrev=543963r1=543962r2=543963 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Sun Jun 3 12:05:55 2007 @@ -58,16 +58,6 @@ /site /distributionManagement - repositories - repository - idjakarta/id - urlhttp://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/url - /repository - repository - idmaven-snapshots/id - urlhttp://people.apache.org/maven-snapshot-repository//url - /repository - /repositories dependencies dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r543998 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: main/java/org/apache/commons/net/ftp/ main/java/org/apache/commons/net/ftp/parser/ main/java/org/apache/commons/net/io
Author: rwinston
Date: Sun Jun 3 14:44:08 2007
New Revision: 543998
URL: http://svn.apache.org/viewvc?view=revrev=543998
Log:
Attempt to provide a workaround for date rollback issue
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/CopyStreamException.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java?view=diffrev=543998r1=543997r2=543998
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
Sun Jun 3 14:44:08 2007
@@ -33,7 +33,7 @@
import org.apache.commons.net.SocketClient;
/***
- * FTP provides the basic the functionality necessary to implement your
+ * FTP provides basic functionality necessary to implement your
* own FTP client. It extends org.apache.commons.net.SocketClient since
* extending TelnetClient was causing unwanted behavior (like connections
* that did not time out properly).
@@ -311,8 +311,7 @@
// returning too soon after encountering a naked CR or some
other
// anomaly.
}
-while (!(line.length() = 4 line.charAt(3) != '-'
- Character.isDigit(line.charAt(0;
+while ((line.length() = 4 || line.charAt(3) == '-' ||
!(line.substring(0,3).matches(\\d{3};
// This is too strong a condition because of non-conforming ftp
// servers like ftp.funet.fi which sent 226 as the last line of a
// 426 multi-line reply in response to ls /. We relax the
condition to
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?view=diffrev=543998r1=543997r2=543998
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Sun Jun 3 14:44:08 2007
@@ -2431,7 +2431,7 @@
public void setListHiddenFiles(boolean listHiddenFiles) {
this.__listHiddenFiles = listHiddenFiles;
}
-
+
/**
* @see #setListHiddenFiles(boolean)
* @return the current state
@@ -2439,6 +2439,27 @@
public boolean getListHiddenFiles() {
return this.__listHiddenFiles;
}
+
+/**
+ *
+ * @return
+ */
+ public boolean isDateRollbackPermitted() {
+ return __configuration.isDateRollbackPermitted();
+ }
+
+ /**
+* Set a boolean flag that specifies whether short date timestamps on
the server
+* (i.e. those with no year component) can be rolled back by a year
if the server
+* timestamp is greater than the local timestamp. This is true by
default.
+*
+* @param dateRollbackPermitted false to explicitly prevent date
rollback
+*/
+ public void setDateRollbackPermitted(boolean dateRollbackPermitted) {
+ __configuration.setDateRollbackPermitted(dateRollbackPermitted);
+ }
+
+
}
/* Emacs configuration
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java?view=diffrev=543998r1=543997r2=543998
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons
svn commit: r527430 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
Author: rwinston Date: Wed Apr 11 02:26:12 2007 New Revision: 527430 URL: http://svn.apache.org/viewvc?view=revrev=527430 Log: Fix javadoc error (NET-154) Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java?view=diffrev=527430r1=527429r2=527430 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java Wed Apr 11 02:26:12 2007 @@ -54,7 +54,7 @@ * When that occurs, the NNTP class method encountering that reply will throw * an [EMAIL PROTECTED] org.apache.commons.net.nntp.NNTPConnectionClosedException} * . - * codeNNTPConectionClosedException/code + * codeNNTPConnectionClosedException/code * is a subclass of code IOException /code and therefore need not be * caught separately, but if you are going to catch it separately, its * catch block must appear before the more general code IOException /code - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r523750 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: main/java/examples/nntp/ main/java/org/apache/commons/net/nntp/ site/xdoc/
Author: rwinston
Date: Thu Mar 29 08:37:00 2007
New Revision: 523750
URL: http://svn.apache.org/viewvc?view=revrev=523750
Log:
Fix NET-155
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/ExtendedNNTPOps.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/MessageThreading.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/NNTPUtils.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NewsgroupInfo.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/ExtendedNNTPOps.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/ExtendedNNTPOps.java?view=diffrev=523750r1=523749r2=523750
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/ExtendedNNTPOps.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/ExtendedNNTPOps.java
Thu Mar 29 08:37:00 2007
@@ -57,8 +57,8 @@
// XOVER
NewsgroupInfo testGroup = new NewsgroupInfo();
client.selectNewsgroup(alt.test, testGroup);
- int lowArticleNumber = testGroup.getFirstArticle();
- int highArticleNumber = lowArticleNumber + 100;
+ long lowArticleNumber = testGroup.getFirstArticle();
+ long highArticleNumber = lowArticleNumber + 100;
Article[] articles = NNTPUtils.getArticleInfo(client,
lowArticleNumber, highArticleNumber);
for (int i = 0; i articles.length; ++i) {
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/MessageThreading.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/MessageThreading.java?view=diffrev=523750r1=523749r2=523750
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/MessageThreading.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/MessageThreading.java
Thu Mar 29 08:37:00 2007
@@ -54,8 +54,8 @@
NewsgroupInfo group = new NewsgroupInfo();
client.selectNewsgroup(comp.lang.lisp, group);
- int lowArticleNumber = group.getFirstArticle();
- int highArticleNumber = lowArticleNumber + 100;
+ long lowArticleNumber = group.getFirstArticle();
+ long highArticleNumber = lowArticleNumber + 100;
System.out.println(Retrieving articles between [ +
lowArticleNumber + ] and [ + highArticleNumber + ]);
Article[] articles = NNTPUtils.getArticleInfo(client,
lowArticleNumber, highArticleNumber);
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/NNTPUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/NNTPUtils.java?view=diffrev=523750r1=523749r2=523750
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/NNTPUtils.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/NNTPUtils.java
Thu Mar 29 08:37:00 2007
@@ -42,7 +42,7 @@
* @return Article[] An array of Article
* @throws IOException
*/
- public static Article[] getArticleInfo(NNTPClient client, int
lowArticleNumber, int highArticleNumber)
+ public static Article[] getArticleInfo(NNTPClient client, long
lowArticleNumber, long highArticleNumber)
throws IOException {
Reader reader = null;
Article[] articles = null;
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java?view=diffrev=523750r1=523749r2=523750
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache
svn commit: r508201 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: RELEASE-NOTES.txt pom.xml src/main/java/org/apache/commons/net/ftp/FTPClient.java
Author: rwinston
Date: Thu Feb 15 14:22:52 2007
New Revision: 508201
URL: http://svn.apache.org/viewvc?view=revrev=508201
Log:
* Remove plugin repo
* Add rel notes
* Add patch for NET-151
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/RELEASE-NOTES.txt
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Added: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/RELEASE-NOTES.txt?view=autorev=508201
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/RELEASE-NOTES.txt (added)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/RELEASE-NOTES.txt Thu
Feb 15 14:22:52 2007
@@ -0,0 +1 @@
+Please see the commons-net web site for a full changelist in this version.
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?view=diffrev=508201r1=508200r2=508201
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Thu Feb 15
14:22:52 2007
@@ -31,14 +31,6 @@
version2-SNAPSHOT/version
/parent
-
- pluginRepositories
- pluginRepository
- idsnapshots/id
-
urlhttp://people.apache.org/maven-snapshot-repository//url
- /pluginRepository
- /pluginRepositories
-
urlhttp://jakarta.apache.org/commons/net//url
organization
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?view=diffrev=508201r1=508200r2=508201
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Thu Feb 15 14:22:52 2007
@@ -274,6 +274,7 @@
private FTPFileEntryParserFactory __parserFactory;
private int __bufferSize;
private boolean __listHiddenFiles;
+private InetAddress __overrideHostForPassiveConnections;
// __systemName is a cached value that should not be referenced directly
// except when assigned in getSystemName and __initDefaults.
@@ -513,7 +514,10 @@
__parsePassiveModeReply((String)_replyLines.get(_replyLines.size()
- 1));
-socket = _socketFactory_.createSocket(__passiveHost,
__passivePort);
+String host = __passiveHost;
+if(__overrideHostForPassiveConnections != null)
+ host = __overrideHostForPassiveConnections.getHostAddress();
+socket = _socketFactory_.createSocket(host, __passivePort);
if ((__restartOffset 0) !restart(__restartOffset))
{
socket.close();
@@ -619,6 +623,20 @@
public boolean isRemoteVerificationEnabled()
{
return __remoteVerificationEnabled;
+}
+
+/***
+ * Override the host used for passive mode data connections.
+ * The default is to use the host given by the FTP server.
+ * You may set this value at any time, whether the
+ * FTPClient is currently connected or not.
+ * p
+ * @param host The inet address of the host to use or null to
+ * disable overriding.
+ ***/
+public void overrideHostForPassiveConnections(InetAddress host)
+{
+ __overrideHostForPassiveConnections = host;
}
/***
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r508214 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: main/java/org/apache/commons/net/ftp/FTPClient.java site/xdoc/changes.xml
Author: rwinston Date: Thu Feb 15 14:36:22 2007 New Revision: 508214 URL: http://svn.apache.org/viewvc?view=revrev=508214 Log: Update release notes Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?view=diffrev=508214r1=508213r2=508214 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java Thu Feb 15 14:36:22 2007 @@ -27,7 +27,6 @@ import java.net.ServerSocket; import java.net.Socket; import java.util.ArrayList; -import java.util.Arrays; import org.apache.commons.net.MalformedServerReplyException; import org.apache.commons.net.ftp.parser.DefaultFTPFileEntryParserFactory; Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diffrev=508214r1=508213r2=508214 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Thu Feb 15 14:36:22 2007 @@ -23,6 +23,9 @@ body release version=2.0 date= description=Java 5.0 release + action dev=rwinston type=update issue=NET-151 + Add support for explictly overriding destination hosts for passive sessions. Thanks to lt;[EMAIL PROTECTED]gt; + /action action dev=rwinston type=update Add null check in TelnetClient::disconnect(). /action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r501780 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: pom.xml src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
Author: rwinston
Date: Wed Jan 31 01:26:35 2007
New Revision: 501780
URL: http://svn.apache.org/viewvc?view=revrev=501780
Log:
Fix META-INF deployment and catch a likely exception in TestConnectTimeout.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?view=diffrev=501780r1=501779r2=501780
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Wed Jan 31
01:26:35 2007
@@ -201,11 +201,11 @@
jar
destfile=target/commons-net-ftp-${version}.jar
fileset dir=target/classes
includes=org/apache/commons/net/ftp/**,org/apache/commons/net/*,org/apache/commons/net/io/*,org/apache/commons/net/util/*/
-
fileset dir=${basedir} includes=LICENSE.txt/
+
metainf dir=${basedir} includes=LICENSE.txt,NOTICE.txt/
manifest
attribute name=Extension-Name value=org.apache.commons.net/
attribute name=Specification-Title value=Jakarta Commons Net/
-
attribute name=Implmentation-Title value=Jakarta Commons Net/
+
attribute name=Implementation-Title value=Jakarta Commons Net/
attribute name=Implementation-Vendor value=The Apache Software Foundation/
attribute name=Implementation-Version value=2.0/
attribute name=Implementation-Vendor-Id value=Apache/
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java?view=diffrev=501780r1=501779r2=501780
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
Wed Jan 31 01:26:35 2007
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.net.SocketException;
import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
import junit.framework.TestCase;
@@ -41,6 +42,9 @@
catch (SocketTimeoutException se) {
assertTrue(true);
}
-
+ catch (UnknownHostException uhe) {
+ // This is most likely a firewall/DNS issue, so let's
just pass the test
+ }
+
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r501365 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net: ftp/AllTests.java ftp/parser/AllTests.java telnet/TelnetTestSimpleServer.java
Author: rwinston Date: Tue Jan 30 02:47:32 2007 New Revision: 501365 URL: http://svn.apache.org/viewvc?view=revrev=501365 Log: Fix licenses Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/AllTests.java jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/AllTests.java jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/AllTests.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/AllTests.java?view=diffrev=501365r1=501364r2=501365 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/AllTests.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/AllTests.java Tue Jan 30 02:47:32 2007 @@ -1,11 +1,12 @@ /* - * Copyright 2005 The Apache Software Foundation + * 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 * - * Licensed 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 + * 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, Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/AllTests.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/AllTests.java?view=diffrev=501365r1=501364r2=501365 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/AllTests.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/AllTests.java Tue Jan 30 02:47:32 2007 @@ -1,8 +1,18 @@ /* - * Created on Apr 5, 2004 + * 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 * - * To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.commons.net.ftp.parser; Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java?view=diffrev=501365r1=501364r2=501365 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java Tue Jan 30 02:47:32 2007 @@ -1,11 +1,12 @@ /* - * Copyright 2003-2004 The Apache Software Foundation + * 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 * - * Licensed under
svn commit: r500609 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: ./ src/main/java/org/apache/commons/net/nntp/ src/test/java/org/apache/commons/net/ntp/ src/test/java/org/apache/commons/n
Author: rwinston Date: Sat Jan 27 12:21:52 2007 New Revision: 500609 URL: http://svn.apache.org/viewvc?view=revrev=500609 Log: Some build changes before next RC Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/Article.java jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ntp/TimeStampTest.java jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/time/TimeTestSimpleServer.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml?view=diffrev=500609r1=500608r2=500609 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml Sat Jan 27 12:21:52 2007 @@ -36,5 +36,12 @@ include*.jar/include /includes /fileSet + fileSet + directorytarget/site/apidocs/directory + outputDirectoryapidocs/outputDirectory + includes + include**/*/include + /includes + /fileSet /fileSets /assembly Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml?view=diffrev=500609r1=500608r2=500609 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml Sat Jan 27 12:21:52 2007 @@ -28,6 +28,7 @@ includeLICENSE*/include includeNOTICE*/include includepom.xml/include +includeassembly*/include /includes /fileSet fileSet Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?view=diffrev=500609r1=500608r2=500609 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Sat Jan 27 12:21:52 2007 @@ -1,19 +1,19 @@ ?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. +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. -- project modelVersion4.0.0/modelVersion @@ -26,7 +26,7 @@ descriptionJakarta Commons Net/description parent - groupIdorg.apache.commons/groupId + groupIdorg.apache.commons/groupId artifactIdcommons-parent/artifactId version1/version /parent @@ -242,6 +242,7 @@ targetPathMETA-INF/targetPath includes
svn commit: r500630 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: pom.xml src/site/xdoc/download.xml
Author: rwinston
Date: Sat Jan 27 13:33:43 2007
New Revision: 500630
URL: http://svn.apache.org/viewvc?view=revrev=500630
Log:
Add commons-parent 2 and fix download links
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/download.xml
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?view=diffrev=500630r1=500629r2=500630
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Sat Jan 27
13:33:43 2007
@@ -28,7 +28,7 @@
parent
groupIdorg.apache.commons/groupId
artifactIdcommons-parent/artifactId
- version1/version
+ version2-SNAPSHOT/version
/parent
@@ -39,7 +39,7 @@
/pluginRepository
/pluginRepositories
-
urlhttp://jakarta.apache.org/commons/${pom.artifactId.substring(8)}//url
+ urlhttp://jakarta.apache.org/commons/net//url
organization
nameThe Apache Software Foundation/name
@@ -71,6 +71,10 @@
idjakarta/id
urlhttp://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/url
/repository
+ repository
+ idmaven-snapshots/id
+
urlhttp://people.apache.org/maven-snapshot-repository//url
+ /repository
/repositories
dependencies
@@ -81,21 +85,6 @@
scopetest/scope
/dependency
/dependencies
-
- mailingLists
- mailingList
- nameCommons Dev List/name
- subscribe[EMAIL PROTECTED]/subscribe
- unsubscribe[EMAIL PROTECTED]/unsubscribe
-
archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive
- /mailingList
- mailingList
- nameCommons User List/name
- subscribe[EMAIL PROTECTED]/subscribe
- unsubscribe[EMAIL PROTECTED]/unsubscribe
-
archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive
- /mailingList
- /mailingLists
developers
developer
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/download.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/download.xml?view=diffrev=500630r1=500629r2=500630
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/download.xml
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/download.xml
Sat Jan 27 13:33:43 2007
@@ -26,7 +26,7 @@
section name=Release Builds
p
-You can download a
href=http://jakarta.apache.org/site/binindex.cgi;binary/a or a
href=http://jakarta.apache.org/site/sourceindex.cgi;source/a production
releases.
+You can download a
href=http://jakarta.apache.org/site/downloads/downloads_commons-net.cgi;binary/a
or a
href=http://jakarta.apache.org/site/downloads/downloads_commons-net.cgi;source/a
production releases.
/p
/section
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r500690 - /jakarta/commons/proper/net/branches/NET_2_0/
Author: rwinston Date: Sat Jan 27 15:36:28 2007 New Revision: 500690 URL: http://svn.apache.org/viewvc?view=revrev=500690 Log: Update RC copy Added: jakarta/commons/proper/net/branches/NET_2_0/ - copied from r500689, jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r498159 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
Author: rwinston Date: Sat Jan 20 11:44:52 2007 New Revision: 498159 URL: http://svn.apache.org/viewvc?view=revrev=498159 Log: Clear reply lines list Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java?view=diffrev=498159r1=498158r2=498159 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java Sat Jan 20 11:44:52 2007 @@ -266,7 +266,7 @@ int length; _newReplyString = true; -//_replyLines. setSize(0); +_replyLines.clear(); String line = _controlInput_.readLine(); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r492106 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
Author: rwinston Date: Wed Jan 3 03:20:00 2007 New Revision: 492106 URL: http://svn.apache.org/viewvc?view=revrev=492106 Log: Add commons-parent Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?view=diffrev=492106r1=492105r2=492106 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Wed Jan 3 03:20:00 2007 @@ -25,6 +25,13 @@ inceptionYear1997/inceptionYear descriptionJakarta Commons Net/description + parent + groupIdorg.apache.commons/groupId + artifactIdcommons-parent/artifactId + version1/version + /parent + + pluginRepositories pluginRepository idsnapshots/id - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r492107 - /jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java
Author: rwinston Date: Wed Jan 3 03:22:28 2007 New Revision: 492107 URL: http://svn.apache.org/viewvc?view=revrev=492107 Log: Fix calendar rollover bug Modified: jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java Modified: jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java?view=diffrev=492107r1=492106r2=492107 == --- jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java (original) +++ jakarta/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java Wed Jan 3 03:22:28 2007 @@ -1,10 +1,9 @@ /* - * 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 + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed 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 * @@ -91,6 +90,7 @@ cal.set(Calendar.MINUTE, 12); cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); + cal.set(Calendar.YEAR, f.getTimestamp().get(Calendar.YEAR)); assertEquals(df.format(cal.getTime()), df.format(f.getTimestamp() .getTime())); @@ -127,3 +127,4 @@ } + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r492108 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java
Author: rwinston Date: Wed Jan 3 03:23:44 2007 New Revision: 492108 URL: http://svn.apache.org/viewvc?view=revrev=492108 Log: Test keyword expansion Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java (contents, props changed) Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java?view=diffrev=492108r1=492107r2=492108 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java Wed Jan 3 03:23:44 2007 @@ -18,7 +18,7 @@ import java.util.Calendar; import junit.framework.TestSuite; - + import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.net.ftp.FTPFileEntryParser; Propchange: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java -- svn:keywords = - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r492109 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java
Author: rwinston Date: Wed Jan 3 03:24:57 2007 New Revision: 492109 URL: http://svn.apache.org/viewvc?view=revrev=492109 Log: Test keyword expansion Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java (contents, props changed) Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java?view=diffrev=492109r1=492108r2=492109 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java Wed Jan 3 03:24:57 2007 @@ -16,7 +16,7 @@ package org.apache.commons.net.ftp.parser; import java.util.Calendar; - + import junit.framework.TestSuite; import org.apache.commons.net.ftp.FTPFile; Propchange: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java -- --- svn:keywords (original) +++ svn:keywords Wed Jan 3 03:24:57 2007 @@ -0,0 +1 @@ +Id Date URL HeadURL Rev - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r491912 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java
Author: rwinston Date: Tue Jan 2 11:52:17 2007 New Revision: 491912 URL: http://svn.apache.org/viewvc?view=revrev=491912 Log: Fix issue where timestamp year fields are different (due to date rollover) Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java?view=diffrev=491912r1=491911r2=491912 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java Tue Jan 2 11:52:17 2007 @@ -90,7 +90,7 @@ cal.set(Calendar.MINUTE, 12); cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); - + cal.set(Calendar.YEAR, f.getTimestamp().get(Calendar.YEAR)); assertEquals(df.format(cal.getTime()), df.format(f.getTimestamp() .getTime())); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r491913 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java
Author: rwinston Date: Tue Jan 2 11:54:31 2007 New Revision: 491913 URL: http://svn.apache.org/viewvc?view=revrev=491913 Log: fix whitespace Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java?view=diffrev=491913r1=491912r2=491913 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParserTest.java Tue Jan 2 11:54:31 2007 @@ -91,6 +91,7 @@ cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); cal.set(Calendar.YEAR, f.getTimestamp().get(Calendar.YEAR)); + assertEquals(df.format(cal.getTime()), df.format(f.getTimestamp() .getTime())); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r489398 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: README assembly-bin.xml assembly-src.xml
Author: rwinston Date: Thu Dec 21 08:36:09 2006 New Revision: 489398 URL: http://svn.apache.org/viewvc?view=revrev=489398 Log: Update license headers to the correct version. See http://www.apache.org/legal/src-headers.html for details Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/README jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/README URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/README?view=diffrev=489398r1=489397r2=489398 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/README (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/README Thu Dec 21 08:36:09 2006 @@ -1,13 +1,10 @@ o Building -To build, you must have ant and/or maven installed. Just type 'ant' -- the default -target will compile the classes, run the tests and build the jar +To build, you must have Maven 2 installed. Maven can be downloaded from -Maven can be downloaded from the main site and there is good documentation -on the targets for building and installation instructions: +http://maven.apache.org/. -http://jakarta.apache.org/turbine/maven o Documentation Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml?view=diffrev=489398r1=489397r2=489398 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml Thu Dec 21 08:36:09 2006 @@ -1,3 +1,19 @@ +!-- +Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- assembly idbin/id formats Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml?view=diffrev=489398r1=489397r2=489398 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml Thu Dec 21 08:36:09 2006 @@ -1,3 +1,19 @@ +!-- +Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- assembly idsrc/id formats - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r489007 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
Author: rwinston
Date: Wed Dec 20 01:59:58 2006
New Revision: 489007
URL: http://svn.apache.org/viewvc?view=revrev=489007
Log:
Add test for group names with embedded spaces
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java?view=diffrev=489007r1=489006r2=489007
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
Wed Dec 20 01:59:58 2006
@@ -47,6 +47,7 @@
-rw-r--r-- 1 root root 190144 Apr 27 2001
zxJDBC-2.0.1b1.zip,
-rwxr-xr-x 2 500 500 166 Nov 2 2001
73131-testtes1.afp,
-rw-r--r-- 1 500 500 166 Nov 9 2001
73131-testtes1.AFP,
+drwx-- 4 maxm Domain Users 512 Oct 2 10:59 .metadata,
}
};
@@ -181,11 +182,6 @@
assertTrue(Should have been a file.,
f.isFile());
assertEquals(17707, f.getSize());
-
-
-
-
-
}
@@ -195,7 +191,7 @@
{
assertEquals(directory.type,
FTPFile.DIRECTORY_TYPE, f.getType());
-}
+}
}
/**
@@ -219,5 +215,14 @@
assertNotNull(f);
assertEquals(name, 123 abc xyz, f.getName());
}
-
+
+/**
+ * Test that group names with embedded spaces can be handled correctly
+ *
+ */
+public void testGroupNameWithSpaces() {
+ FTPFile f = getParser().parseFTPEntry(drwx-- 4 maxm Domain Users
512 Oct 2 10:59 .metadata);
+ assertEquals(f.getGroup(), Domain Users);
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r489036 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
Author: rwinston
Date: Wed Dec 20 03:03:27 2006
New Revision: 489036
URL: http://svn.apache.org/viewvc?view=revrev=489036
Log:
Added null check on disconnect()
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/TelnetClient.java?view=diffrev=489036r1=489035r2=489036
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/TelnetClient.java
Wed Dec 20 03:03:27 2006
@@ -123,8 +123,10 @@
***/
public void disconnect() throws IOException
{
-__input.close();
-__output.close();
+if (__input != null)
+ __input.close();
+if (__output != null)
+ __output.close();
super.disconnect();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r489059 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc: changes.xml migration.xml
Author: rwinston Date: Wed Dec 20 03:35:39 2006 New Revision: 489059 URL: http://svn.apache.org/viewvc?view=revrev=489059 Log: (empty) Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/migration.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diffrev=489059r1=489058r2=489059 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Wed Dec 20 03:35:39 2006 @@ -23,6 +23,9 @@ body release version=2.0 date= description=Java 5.0 release + action dev=rwinston type=update + Add null check in TelnetClient::disconnect(). + /action action dev=rwinston type=remove Remove deprecated FTPFileIterator and FTPFileList classes. /action Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/migration.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/migration.xml?view=diffrev=489059r1=489058r2=489059 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/migration.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/migration.xml Wed Dec 20 03:35:39 2006 @@ -30,6 +30,13 @@ /p /section +section name=Commons/Net 1.4.x to Commons/Net 2.0 + p + This version requires a JDK 5.0+ runtime. It has also been tested on JDK 6.0. There should + be no changes required to existing client code. + /p +/section + section name=NetComponents 1.3.8 to Commons/Net p This version is a drop in replacement for NetComponents. Only package names have changed. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r489067 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: main/java/org/apache/commons/net/ntp/TimeInfo.java main/java/org/apache/commons/net/telnet/TelnetOption.java site/site
Author: rwinston
Date: Wed Dec 20 04:24:43 2006
New Revision: 489067
URL: http://svn.apache.org/viewvc?view=revrev=489067
Log:
Some more FindBugs improvements
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/TimeInfo.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/TelnetOption.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/TimeInfo.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/TimeInfo.java?view=diffrev=489067r1=489066r2=489067
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/TimeInfo.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/TimeInfo.java
Wed Dec 20 04:24:43 2006
@@ -29,7 +29,7 @@
public class TimeInfo {
private NtpV3Packet _message;
-private List _comments;
+private ListString _comments;
private Long _delay;
private Long _offset;
@@ -117,7 +117,7 @@
public void addComment(String comment)
{
if (_comments == null) {
-_comments = new ArrayList();
+_comments = new ArrayListString();
}
_comments.add(comment);
}
@@ -133,7 +133,7 @@
}
_detailsComputed = true;
if (_comments == null) {
-_comments = new ArrayList();
+_comments = new ArrayListString();
}
TimeStamp origNtpTime = _message.getOriginateTimeStamp();
@@ -169,7 +169,7 @@
// might be via a broadcast NTP packet...
if (xmitNtpTime.ntpValue() != 0)
{
-_offset = new Long(xmitTime - _returnTime);
+_offset = Long.valueOf(xmitTime - _returnTime);
_comments.add(Error: zero orig time -- cannot compute delay);
} else
_comments.add(Error: zero orig time -- cannot compute
delay/offset);
@@ -183,7 +183,7 @@
{
// without receive or xmit time cannot figure out processing
time
// so delay is simply the network travel time
-_delay = new Long(_returnTime - origTime);
+_delay = Long.valueOf(_returnTime - origTime);
}
// TODO: is offset still valid if rcvNtpTime=0 || xmitNtpTime=0 ???
// Could always hash origNtpTime (sendTime) but if host doesn't
set it
@@ -192,11 +192,11 @@
if (rcvNtpTime.ntpValue() != 0)
{
// xmitTime is 0 just use rcv time
-_offset = new Long(rcvTime - origTime);
+_offset = Long.valueOf(rcvTime - origTime);
} else if (xmitNtpTime.ntpValue() != 0)
{
// rcvTime is 0 just use xmitTime time
-_offset = new Long(xmitTime - _returnTime);
+_offset = Long.valueOf(xmitTime - _returnTime);
}
} else
{
@@ -231,11 +231,11 @@
_comments.add(Warning: processing time total
network time);
}
}
- _delay = new Long(delayValue);
+ _delay = Long.valueOf(delayValue);
if (origTime _returnTime) // assert destTime = origTime
_comments.add(Error: OrigTime DestRcvTime);
-_offset = new Long(((rcvTime - origTime) + (xmitTime -
_returnTime)) / 2);
+_offset = Long.valueOf(((rcvTime - origTime) + (xmitTime -
_returnTime)) / 2);
}
}
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/TelnetOption.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/TelnetOption.java?view=diffrev=489067r1=489066r2=489067
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/TelnetOption.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/TelnetOption.java
Wed Dec 20 04:24:43 2006
@@ -32,87 +32,87 @@
/*** The maximum value an option code can have. This value is 255. ***/
public static final int MAX_OPTION_VALUE = 255;
-public static int BINARY = 0;
+public static final int BINARY = 0;
-public static int ECHO = 1;
+public static final int ECHO = 1;
-public static int PREPARE_TO_RECONNECT = 2;
+public static final int PREPARE_TO_RECONNECT = 2;
-public static int SUPPRESS_GO_AHEAD = 3
svn commit: r489178 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: NOTICE.txt project.properties
Author: rwinston Date: Wed Dec 20 11:34:22 2006 New Revision: 489178 URL: http://svn.apache.org/viewvc?view=revrev=489178 Log: (empty) Removed: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/project.properties Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/NOTICE.txt Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/NOTICE.txt URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/NOTICE.txt?view=diffrev=489178r1=489177r2=489178 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/NOTICE.txt (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/NOTICE.txt Wed Dec 20 11:34:22 2006 @@ -1,2 +1,6 @@ +Apache Jakarta Commons Net +Copyright 2001-2006 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r489220 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: pom.xml src/main/java/org/apache/commons/net/ftp/FTPClient.java
Author: rwinston Date: Wed Dec 20 15:15:05 2006 New Revision: 489220 URL: http://svn.apache.org/viewvc?view=revrev=489220 Log: Add license and change manifest Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?view=diffrev=489220r1=489219r2=489220 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Wed Dec 20 15:15:05 2006 @@ -1,18 +1,19 @@ ?xml version=1.0? !-- -Copyright 2003-2006 The Apache Software Foundation - -Licensed 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. + 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. -- project modelVersion4.0.0/modelVersion @@ -208,8 +209,12 @@ manifest attribute name=Extension-Name value=org.apache.commons.net/ attribute name=Specification-Title value=Jakarta Commons Net/ - attribute name=Specification-Vendor value=The Apache Software Foundation/ - attribute name=Specification-Version value=2.0/ + attribute name=Implmentation-Title value=Jakarta Commons Net/ + attribute name=Implementation-Vendor value=The Apache Software Foundation/ + attribute name=Implementation-Version value=2.0/ + attribute name=Implementation-Vendor-Id value=Apache/ + + /manifest /jar Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?view=diffrev=489220r1=489219r2=489220 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java Wed Dec 20 15:15:05 2006 @@ -1966,6 +1966,7 @@ results = new ArrayListString(); while ((line = reader.readLine()) != null) results.add(line); + reader.close(); socket.close(); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r488452 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Author: rwinston
Date: Mon Dec 18 15:13:08 2006
New Revision: 488452
URL: http://svn.apache.org/viewvc?view=revrev=488452
Log:
Fix listNames() and printWorkingDirectory()
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?view=diffrev=488452r1=488451r2=488452
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Mon Dec 18 15:13:08 2006
@@ -1810,7 +1810,7 @@
if (pwd() != FTPReply.PATHNAME_CREATED)
return null;
-return __parsePathname((String)_replyLines.get(0));
+return __parsePathname((String)_replyLines.get( _replyLines.size() -
1));
}
@@ -1971,10 +1971,8 @@
if (completePendingCommand())
{
-String[] result;
-result = new String[results.size()];
-results.addAll(Arrays.asList(result));
-return result;
+ String[] names = new String[ results.size() ];
+return results.toArray(names);
}
return null;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r482832 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: main/java/org/apache/commons/net/ftp/FTPClient.java main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryPar
Author: rwinston Date: Tue Dec 5 15:59:10 2006 New Revision: 482832 URL: http://svn.apache.org/viewvc?view=revrev=482832 Log: Minor Javadoc changes Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?view=diffrev=482832r1=482831r2=482832 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java Tue Dec 5 15:59:10 2006 @@ -103,8 +103,7 @@ * code FTP.STREAM_TRANSFER_MODE /code, and * code FTP.FILE_STRUCTURE /code. The only file types directly supported * are code FTP.ASCII_FILE_TYPE /code and - * code FTP.IMAGE_FILE_TYPE /code (which is the same as - * code FTP.BINARY_FILE_TYPE /code). Because there are at lest 4 + * code FTP.BINARY_FILE_TYPE /code. Because there are at least 4 * different EBCDIC encodings, we have opted not to provide direct support * for EBCDIC. To transfer EBCDIC and other unsupported file types you * must create your own filter InputStreams and OutputStreams and wrap @@ -954,7 +953,7 @@ /*** * Sets the file type to be transferred. This should be one of - * code FTP.ASCII_FILE_TYPE /code, code FTP.IMAGE_FILE_TYPE /code, + * code FTP.ASCII_FILE_TYPE /code, code FTP.BINARY_FILE_TYPE/code, * etc. The file type only needs to be set when you want to change the * type. After changing it, the new type stays in effect until you change * it again. The default file type is code FTP.ASCII_FILE_TYPE /code @@ -986,7 +985,7 @@ /*** * Sets the file type to be transferred and the format. The type should be * one of code FTP.ASCII_FILE_TYPE /code, - * code FTP.IMAGE_FILE_TYPE /code, etc. The file type only needs to + * code FTP.BINARY_FILE_TYPE /code, etc. The file type only needs to * be set when you want to change the type. After changing it, the new * type stays in effect until you change it again. The default file type * is code FTP.ASCII_FILE_TYPE /code if this method is never called. Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java?view=diffrev=482832r1=482831r2=482832 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java Tue Dec 5 15:59:10 2006 @@ -67,6 +67,7 @@ * li[EMAIL PROTECTED] FTPClientConfig#SYST_OS400 OS/400}/li * li[EMAIL PROTECTED] FTPClientConfig#SYST_VMS VMS}/li * li[EMAIL PROTECTED] FTPClientConfig#SYST_MVS MVS}/li + * li[EMAIL PROTECTED] FTPClientConfig#SYST_NETWARE}/li * /ul * @return the FTPFileEntryParser corresponding to the supplied key. * @throws ParserInitializationException thrown if for any reason the factory cannot resolve Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diffrev=482832r1=482831r2=482832 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Tue Dec 5 15:59:10 2006 @@ -23,6 +23,9 @@ body release version=2.0 date= description=Java 5.0 release + action dev=rwinston type=add + Add connection timeout functionality to SocketClient. + /action action dev=rwinston type=update Make the KeyManager and TrustManager settable (lt;[EMAIL PROTECTED]gt
svn commit: r482847 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp: FTPClientConfig.java FTPFileEntryParserImpl.java FTPFileIterator.java FTPFileList
Author: rwinston
Date: Tue Dec 5 16:36:58 2006
New Revision: 482847
URL: http://svn.apache.org/viewvc?view=revrev=482847
Log:
Remove some deprecated classes
Removed:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileIterator.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileList.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java?view=diffrev=482847r1=482846r2=482847
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
Tue Dec 5 16:36:58 2006
@@ -239,7 +239,7 @@
this.serverTimeZoneId = serverTimeZoneId;
}
- private static Map LANGUAGE_CODE_MAP = new TreeMap();
+ private static MapString, Object LANGUAGE_CODE_MAP = new
TreeMapString, Object();
static {
// if there are other commonly used month name encodings which
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java?view=diffrev=482847r1=482846r2=482847
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
Tue Dec 5 16:36:58 2006
@@ -16,7 +16,6 @@
package org.apache.commons.net.ftp;
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStream;
import java.util.Iterator;
import java.util.List;
@@ -34,49 +33,6 @@
*/
public FTPFileEntryParserImpl()
{
-}
-
-
-/***
- * Parses an FTP server file listing and converts it into a usable format
- * in the form of an array of code FTPFile /code instances. If the
- * file list contains no files, code null /code should be
- * returned, otherwise an array of code FTPFile /code instances
- * representing the files in the directory is returned.
- * p
- * @param listStream The InputStream from which the file list should be
- *read.
- * @return The list of file information contained in the given path. null
- * if the list could not be obtained or if there are no files in
- * the directory.
- * @exception java.io.IOException If an I/O error occurs reading the
listStream.
- ***/
-public FTPFile[] parseFileList(InputStream listStream, String encoding)
throws IOException
-{
-FTPFileList ffl = FTPFileList.create(listStream, this, encoding);
-return ffl.getFiles();
-
-}
-
-/***
- * Parses an FTP server file listing and converts it into a usable format
- * in the form of an array of code FTPFile /code instances. If the
- * file list contains no files, code null /code should be
- * returned, otherwise an array of code FTPFile /code instances
- * representing the files in the directory is returned.
- * p
- * @param listStream The InputStream from which the file list should be
- *read.
- * @return The list of file information contained in the given path. null
- * if the list could not be obtained or if there are no files in
- * the directory.
- * @exception java.io.IOException If an I/O error occurs reading the
listStream.
- *
- * @deprecated The version of this method which takes an encoding should
be used.
-***/
-public FTPFile[] parseFileList(InputStream listStream) throws IOException
-{
- return parseFileList(listStream, null);
}
/**
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp
svn commit: r482855 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
Author: rwinston Date: Tue Dec 5 16:53:00 2006 New Revision: 482855 URL: http://svn.apache.org/viewvc?view=revrev=482855 Log: Update changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diffrev=482855r1=482854r2=482855 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Tue Dec 5 16:53:00 2006 @@ -23,6 +23,9 @@ body release version=2.0 date= description=Java 5.0 release + action dev=rwinston type=remove + Remove deprecated FTPFileIterator and FTPFileList classes. + /action action dev=rwinston type=add Add connection timeout functionality to SocketClient. /action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r480995 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/PrintCommandListener.java
Author: rwinston
Date: Thu Nov 30 08:45:28 2006
New Revision: 480995
URL: http://svn.apache.org/viewvc?view=revrev=480995
Log:
Added back
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/PrintCommandListener.java
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/PrintCommandListener.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/PrintCommandListener.java?view=autorev=480995
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/PrintCommandListener.java
(added)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/PrintCommandListener.java
Thu Nov 30 08:45:28 2006
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.net;
+
+import java.io.PrintWriter;
+import org.apache.commons.net.ProtocolCommandEvent;
+import org.apache.commons.net.ProtocolCommandListener;
+
+/***
+ * This is a support class for some of the example programs. It is
+ * a sample implementation of the ProtocolCommandListener interface
+ * which just prints out to a specified stream all command/reply traffic.
+ * p
+ ***/
+
+public class PrintCommandListener implements ProtocolCommandListener
+{
+private PrintWriter __writer;
+
+public PrintCommandListener(PrintWriter writer)
+{
+__writer = writer;
+}
+
+public void protocolCommandSent(ProtocolCommandEvent event)
+{
+__writer.print(event.getMessage());
+__writer.flush();
+}
+
+public void protocolReplyReceived(ProtocolCommandEvent event)
+{
+__writer.print(event.getMessage());
+__writer.flush();
+}
+}
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r479122 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Author: rwinston
Date: Sat Nov 25 04:57:17 2006
New Revision: 479122
URL: http://svn.apache.org/viewvc?view=revrev=479122
Log:
Make the KeyManager settable
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?view=diffrev=479122r1=479121r2=479122
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Sat Nov 25 04:57:17 2006
@@ -23,6 +23,7 @@
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
+import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLServerSocketFactory;
@@ -79,6 +80,9 @@
/** The FTPS [EMAIL PROTECTED] TrustManager} implementation. */
private TrustManager trustManager = new FTPSTrustManager();
+
+/** The [EMAIL PROTECTED] KeyManager} */
+private KeyManager keyManager;
/**
* Constructor for FTPSClient.
@@ -194,7 +198,7 @@
planeSocket = _socket_;
try {
- context.init(null, new TrustManager[] {
getTrustManager() } , null);
+ context.init(new KeyManager[] { getKeyManager() } , new
TrustManager[] { getTrustManager() } , null);
} catch (KeyManagementException e) {
e.printStackTrace();
}
@@ -222,8 +226,25 @@
_controlOutput_ = new BufferedWriter(new OutputStreamWriter(
socket.getOutputStream(), getControlEncoding()));
}
-
+
+/**
+ * Get the [EMAIL PROTECTED] KeyManager} instance.
+ * @return The [EMAIL PROTECTED] KeyManager} instance
+ */
+private KeyManager getKeyManager() {
+ return keyManager;
+ }
+
/**
+* Set a [EMAIL PROTECTED] KeyManager} to use
+*
+* @param keyManager The KeyManager implementation to set.
+*/
+public void setKeyManager(KeyManager keyManager) {
+ this.keyManager = keyManager;
+}
+
+ /**
* Controls whether new a SSL session may be established by this socket.
* @param isCreation The established socket flag.
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r479125 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
Author: rwinston Date: Sat Nov 25 05:20:12 2006 New Revision: 479125 URL: http://svn.apache.org/viewvc?view=revrev=479125 Log: Update latest changes Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diffrev=479125r1=479124r2=479125 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Sat Nov 25 05:20:12 2006 @@ -24,6 +24,9 @@ body release version=2.0 date= description=Java 5.0 release action dev=rwinston type=update + Make the KeyManager and TrustManager settable (lt;[EMAIL PROTECTED]gt;). + /action + action dev=rwinston type=update Patch FTPSClient to set default SSLServerSocketFactory. Thanks lt;[EMAIL PROTECTED]gt; /action action dev=rwinston type=fix issue=NET-68 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r474096 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Author: rwinston
Date: Sun Nov 12 15:52:59 2006
New Revision: 474096
URL: http://svn.apache.org/viewvc?view=revrev=474096
Log:
Add the ability to set a custom TrustManager implementation
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?view=diffrev=474096r1=474095r2=474096
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Sun Nov 12 15:52:59 2006
@@ -76,6 +76,9 @@
private String[] suites = null;
/** The protocol versions */
private String[] protocols = null;
+
+/** The FTPS [EMAIL PROTECTED] TrustManager} implementation. */
+private TrustManager trustManager = new FTPSTrustManager();
/**
* Constructor for FTPSClient.
@@ -191,7 +194,7 @@
planeSocket = _socket_;
try {
- context.init(null, new TrustManager[] { new
FTPSTrustManager() } , null);
+ context.init(null, new TrustManager[] {
getTrustManager() } , null);
} catch (KeyManagementException e) {
e.printStackTrace();
}
@@ -457,4 +460,25 @@
}
return socket;
}
+
+/**
+ * Get the currently configured [EMAIL PROTECTED] TrustManager}.
+ *
+ * @return A TrustManager instance.
+ */
+ public TrustManager getTrustManager() {
+ return trustManager;
+ }
+
+ /**
+* Override the default [EMAIL PROTECTED] TrustManager} to use.
+*
+* @param trustManager The TrustManager implementation to set.
+*/
+ public void setTrustManager(TrustManager trustManager) {
+ this.trustManager = trustManager;
+ }
+
+
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r474098 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
Author: rwinston
Date: Sun Nov 12 15:54:14 2006
New Revision: 474098
URL: http://svn.apache.org/viewvc?view=revrev=474098
Log:
Remove redundant check
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java?view=diffrev=474098r1=474097r2=474098
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
Sun Nov 12 15:54:14 2006
@@ -148,10 +148,7 @@
throws SocketException, IOException
{
_socket_ = _socketFactory_.createSocket();
- if (connectTimeout == DEFAULT_CONNECT_TIMEOUT)
- _socket_.connect(new InetSocketAddress(host, port));
- else
- _socket_.connect(new InetSocketAddress(host, port),
connectTimeout);
+ _socket_.connect(new InetSocketAddress(host, port), connectTimeout);
_connectAction_();
}
@@ -174,10 +171,7 @@
throws SocketException, IOException
{
_socket_= _socketFactory_.createSocket();
- if (connectTimeout == DEFAULT_CONNECT_TIMEOUT)
- _socket_.connect(new InetSocketAddress(hostname, port));
- else
- _socket_.connect(new InetSocketAddress(hostname, port),
connectTimeout);
+ _socket_.connect(new InetSocketAddress(hostname, port), connectTimeout);
_connectAction_();
}
@@ -204,11 +198,7 @@
{
_socket_ = _socketFactory_.createSocket();
_socket_.bind(new InetSocketAddress(localAddr, localPort));
-
- if (connectTimeout == DEFAULT_CONNECT_TIMEOUT)
- _socket_.connect(new InetSocketAddress(host, port));
- else
- _socket_.connect(new InetSocketAddress(host, port),
connectTimeout);
+ _socket_.connect(new InetSocketAddress(host, port), connectTimeout);
_connectAction_();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r474103 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Author: rwinston Date: Sun Nov 12 16:06:51 2006 New Revision: 474103 URL: http://svn.apache.org/viewvc?view=revrev=474103 Log: Remove redundant comment and work around the issue where _replyLines_.get(0) was returning the incorrect reply line : change this to _replyLines_.get( _replyLines_.size() -1 ). This issue may need to be looked at again. Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?view=diffrev=474103r1=474102r2=474103 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java Sun Nov 12 16:06:51 2006 @@ -219,11 +219,6 @@ * liare in different timezones and you need accurate timestamps for dependency checking * as in Ant/li * /ulsee [EMAIL PROTECTED] FTPClientConfig FTPClientConfig}. - * p - * NOTE: If you experience problems with unwanted firing of presetSoTimeout()/pre - * during periods of client inactivity, this can be alleviated by calling presetReaderThread(false)/pre. - * For more details, see a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=31122;this thread/a. - * /p * p * @author Daniel F. Savarese * @see FTP @@ -515,7 +510,7 @@ if (pasv() != FTPReply.ENTERING_PASSIVE_MODE) return null; -__parsePassiveModeReply((String)_replyLines.get(0)); +__parsePassiveModeReply((String)_replyLines.get(_replyLines.size() - 1)); socket = _socketFactory_.createSocket(__passiveHost, __passivePort); if ((__restartOffset 0) !restart(__restartOffset)) @@ -1863,7 +1858,7 @@ // in practice FTP servers deviate, so we soften the condition to // a positive completion. if (__systemName == null FTPReply.isPositiveCompletion(syst())) -__systemName = ((String)_replyLines.get(0)).substring(4); +__systemName = ((String)_replyLines.get(_replyLines.size() - 1)).substring(4); return __systemName; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r473744 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
Author: rwinston
Date: Sat Nov 11 08:09:00 2006
New Revision: 473744
URL: http://svn.apache.org/viewvc?view=revrev=473744
Log:
NET-68: TFTP client drops last packet
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/tftp/TFTPClient.java?view=diffrev=473744r1=473743r2=473744
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
Sat Nov 11 08:09:00 2006
@@ -22,7 +22,6 @@
import java.net.InetAddress;
import java.net.SocketException;
import java.net.UnknownHostException;
-
import org.apache.commons.net.io.FromNetASCIIOutputStream;
import org.apache.commons.net.io.ToNetASCIIInputStream;
@@ -361,7 +360,7 @@
public void sendFile(String filename, int mode, InputStream input,
InetAddress host, int port) throws IOException
{
-int bytesRead, timeouts, lastBlock, block, hostPort, dataLength,
offset;
+int bytesRead, timeouts, lastBlock, block, hostPort, dataLength,
offset, totalThisPacket;
TFTPPacket sent, received = null;
TFTPErrorPacket error;
TFTPDataPacket data =
@@ -369,10 +368,13 @@
;
TFTPAckPacket ack;
+boolean justStarted = true;
+
beginBufferedOps();
-dataLength = lastBlock = hostPort = bytesRead = 0;
+dataLength = lastBlock = hostPort = bytesRead = totalThisPacket = 0;
block = 0;
+boolean lastAckWait = false;
if (mode == TFTP.ASCII_MODE)
input = new ToNetASCIIInputStream(input);
@@ -383,11 +385,16 @@
_sendPacket:
do
{
+// first time: block is 0, lastBlock is 0, send a request packet.
+// subsequent: block is integer starting at 1, send data packet.
bufferedSend(sent);
-
+
+// this is trying to receive an ACK
_receivePacket:
while (true)
{
+
+
timeouts = 0;
while (timeouts __maxTimeouts)
{
@@ -419,12 +426,13 @@
endBufferedOps();
throw new IOException(Bad packet: + e.getMessage());
}
-}
+} // end of while loop over tries to receive
// The first time we receive we get the port number and
// answering host address (for hosts with multiple IPs)
-if (lastBlock == 0)
+if (justStarted)
{
+justStarted = false;
hostPort = received.getPort();
data.setPort(hostPort);
if(!host.equals(received.getAddress()))
@@ -456,7 +464,13 @@
if (lastBlock == block)
{
++block;
-break _receivePacket;
+if (lastAckWait) {
+
+ break _sendPacket;
+}
+else {
+ break _receivePacket;
+}
}
else
{
@@ -489,22 +503,33 @@
//break;
}
+// OK, we have just gotten ACK about the last data we sent. Make
another
+// and send it
+
dataLength = TFTPPacket.SEGMENT_SIZE;
offset = 4;
+totalThisPacket = 0;
while (dataLength 0
(bytesRead = input.read(_sendBuffer, offset, dataLength))
0)
{
offset += bytesRead;
dataLength -= bytesRead;
+totalThisPacket += bytesRead;
}
+if( totalThisPacket TFTPPacket.SEGMENT_SIZE ) {
+/* this will be our last packet -- send, wait for ack, stop */
+lastAckWait = true;
+}
data.setBlockNumber(block);
-data.setData(_sendBuffer, 4, offset - 4);
+data.setData(_sendBuffer, 4, totalThisPacket);
sent = data;
}
-while (dataLength == 0);
-
-bufferedSend(sent);
+while ( totalThisPacket 0 || lastAckWait );
+// Note: this was looping while dataLength == 0 || lastAckWait,
+// which was discarding the last
svn commit: r473746 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Author: rwinston
Date: Sat Nov 11 08:27:37 2006
New Revision: 473746
URL: http://svn.apache.org/viewvc?view=revrev=473746
Log:
Experimental patch to fix FTPS PROT issue (see
http://www.mail-archive.com/commons-dev@jakarta.apache.org/msg85614.html)
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?view=diffrev=473746r1=473745r2=473746
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Sat Nov 11 08:27:37 2006
@@ -25,6 +25,7 @@
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLServerSocketFactory;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
@@ -380,8 +381,10 @@
throw new SSLException(getReplyString());
if (DEFAULT_PROT.equals(prot)) {
setSocketFactory(null);
+setServerSocketFactory(null);
} else {
setSocketFactory(new FTPSSocketFactory(context));
+setServerSocketFactory(SSLServerSocketFactory.getDefault());
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r473758 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
Author: rwinston Date: Sat Nov 11 08:52:39 2006 New Revision: 473758 URL: http://svn.apache.org/viewvc?view=revrev=473758 Log: Add changes Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diffrev=473758r1=473757r2=473758 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Sat Nov 11 08:52:39 2006 @@ -23,6 +23,12 @@ body release version=2.0 date= description=Java 5.0 release + action dev=rwinston type=update + Patch FTPSClient to set default SSLServerSocketFactory. Thanks lt;[EMAIL PROTECTED]gt; + /action + action dev=rwinston type=fix issue=NET-68 + Patch to prevent TFTPClient dropping last packet. Thanks lt;[EMAIL PROTECTED]gt; + /action action dev=rwinston type=add FTPS (TLS and SSL) is now supported. Thanks to Jose Juan Montiel, Paul Ferraro, and Satoshi Ishigami. /action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r473759 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
Author: rwinston Date: Sat Nov 11 08:55:38 2006 New Revision: 473759 URL: http://svn.apache.org/viewvc?view=revrev=473759 Log: More changes Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diffrev=473759r1=473758r2=473759 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Sat Nov 11 08:55:38 2006 @@ -29,6 +29,9 @@ action dev=rwinston type=fix issue=NET-68 Patch to prevent TFTPClient dropping last packet. Thanks lt;[EMAIL PROTECTED]gt; /action + action dev=rwinston type=update + Change isConnected() method to delegate to underlying socket connection. + /action action dev=rwinston type=add FTPS (TLS and SSL) is now supported. Thanks to Jose Juan Montiel, Paul Ferraro, and Satoshi Ishigami. /action - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r473763 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: main/java/org/apache/commons/net/SocketClient.java test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
Author: rwinston
Date: Sat Nov 11 09:46:12 2006
New Revision: 473763
URL: http://svn.apache.org/viewvc?view=revrev=473763
Log:
Add preliminary support for socket connection timeout
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java?view=diffrev=473763r1=473762r2=473763
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
Sat Nov 11 09:46:12 2006
@@ -19,8 +19,10 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketException;
+import java.net.UnknownHostException;
import javax.net.ServerSocketFactory;
import javax.net.SocketFactory;
@@ -82,6 +84,10 @@
/** The socket's ServerSocket Factory. */
protected ServerSocketFactory _serverSocketFactory_;
+
+/** The socket's connect timeout (0 = infinite timeout) */
+private static final int DEFAULT_CONNECT_TIMEOUT = 0;
+protected int connectTimeout = DEFAULT_CONNECT_TIMEOUT;
/**
* Default constructor for SocketClient. Initializes
@@ -141,7 +147,12 @@
public void connect(InetAddress host, int port)
throws SocketException, IOException
{
-_socket_ = _socketFactory_.createSocket(host, port);
+ _socket_ = _socketFactory_.createSocket();
+ if (connectTimeout == DEFAULT_CONNECT_TIMEOUT)
+ _socket_.connect(new InetSocketAddress(host, port));
+ else
+ _socket_.connect(new InetSocketAddress(host, port),
connectTimeout);
+
_connectAction_();
}
@@ -162,7 +173,12 @@
public void connect(String hostname, int port)
throws SocketException, IOException
{
-_socket_ = _socketFactory_.createSocket(hostname, port);
+ _socket_= _socketFactory_.createSocket();
+ if (connectTimeout == DEFAULT_CONNECT_TIMEOUT)
+ _socket_.connect(new InetSocketAddress(hostname, port));
+ else
+ _socket_.connect(new InetSocketAddress(hostname, port),
connectTimeout);
+
_connectAction_();
}
@@ -186,7 +202,14 @@
InetAddress localAddr, int localPort)
throws SocketException, IOException
{
-_socket_ = _socketFactory_.createSocket(host, port, localAddr,
localPort);
+ _socket_ = _socketFactory_.createSocket();
+ _socket_.bind(new InetSocketAddress(localAddr, localPort));
+
+ if (connectTimeout == DEFAULT_CONNECT_TIMEOUT)
+ _socket_.connect(new InetSocketAddress(host, port));
+ else
+ _socket_.connect(new InetSocketAddress(host, port),
connectTimeout);
+
_connectAction_();
}
@@ -519,6 +542,26 @@
else
_serverSocketFactory_ = factory;
}
+
+/**
+ * Sets the connection timeout in milliseconds, which will be passed to
the [EMAIL PROTECTED] Socket} object's
+ * connect() method.
+ * @param connectTimeout The connection timeout to use (in ms)
+ */
+public void setConnectTimeout(int connectTimeout) {
+ this.connectTimeout = connectTimeout;
+}
+
+/**
+ * Get the underlying socket connection timeout.
+ * @return
+ */
+public int getConnectTimeout() {
+ return connectTimeout;
+}
+
+
+
}
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java?view=autorev=473763
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
(added)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
Sat Nov 11 09:46:12 2006
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2001-2006 The Apache Software Foundation
+ *
+ * Licensed 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
svn commit: r473765 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
Author: rwinston
Date: Sat Nov 11 10:00:21 2006
New Revision: 473765
URL: http://svn.apache.org/viewvc?view=revrev=473765
Log:
typo
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java?view=diffrev=473765r1=473764r2=473765
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
Sat Nov 11 10:00:21 2006
@@ -36,7 +36,7 @@
try {
// Connect to a valid host on a bogus port
client.connect(ftp.microsoft.com, 1234);
- assertTrue(Expecting SocketTImeoutException, false);
+ assertTrue(Expecting SocketTimeoutException, false);
}
catch (SocketTimeoutException se) {
assertTrue(true);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r470520 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net: SocketClient.java ftp/FTP.java ftp/FTPClient.java ftp/parser/VMSVersioningFTPEntryPar
Author: rwinston
Date: Thu Nov 2 13:02:43 2006
New Revision: 470520
URL: http://svn.apache.org/viewvc?view=revrev=470520
Log:
* Add _socket_.isConnected() and null check
* Add some generification
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java?view=diffrev=470520r1=470519r2=470520
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
Thu Nov 2 13:02:43 2006
@@ -68,11 +68,6 @@
/** The socket used for the connection. */
protected Socket _socket_;
-/**
- * A status variable indicating if the client's socket is currently open.
- */
-protected boolean _isConnected_;
-
/** The default port the client should connect to. */
protected int _defaultPort_;
@@ -101,7 +96,6 @@
_output_ = null;
_timeout_ = 0;
_defaultPort_ = 0;
-_isConnected_ = false;
_socketFactory_ = __DEFAULT_SOCKET_FACTORY;
_serverSocketFactory_ = __DEFAULT_SERVER_SOCKET_FACTORY;
}
@@ -128,7 +122,6 @@
_socket_.setSoTimeout(_timeout_);
_input_ = _socket_.getInputStream();
_output_ = _socket_.getOutputStream();
-_isConnected_ = true;
}
@@ -279,7 +272,6 @@
if (_socket_ != null) _socket_ = null;
_input_ = null;
_output_ = null;
-_isConnected_ = false;
}
@@ -291,7 +283,10 @@
*/
public boolean isConnected()
{
-return _isConnected_;
+if (_socket_ == null)
+ return false;
+
+ return _socket_.isConnected();
}
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java?view=diffrev=470520r1=470519r2=470520
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
Thu Nov 2 13:02:43 2006
@@ -22,8 +22,8 @@
import java.net.InetAddress;
import java.net.Socket;
import java.net.SocketException;
-import java.util.Enumeration;
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.Arrays;
import org.apache.commons.net.MalformedServerReplyException;
import org.apache.commons.net.ProtocolCommandListener;
@@ -214,7 +214,7 @@
private StringBuilder __commandBuffer = new StringBuilder();
protected int _replyCode;
-protected VectorString _replyLines;
+protected ArrayListString _replyLines;
protected boolean _newReplyString;
protected String _replyString;
protected String _controlEncoding;
@@ -252,7 +252,7 @@
{
super();
setDefaultPort(DEFAULT_PORT);
-_replyLines = new VectorString();
+_replyLines = new ArrayListString();
_newReplyString = false;
_replyString = null;
_commandSupport_ = new ProtocolCommandSupport(this);
@@ -264,7 +264,7 @@
int length;
_newReplyString = true;
-_replyLines.setSize(0);
+//_replyLines. setSize(0);
String line = _controlInput_.readLine();
@@ -290,7 +290,7 @@
Could not parse response code.\nServer Reply: + line);
}
-_replyLines.addElement(line);
+_replyLines.add(line);
// Get extra lines if message continues.
if (length 3 line.charAt(3) == '-')
@@ -303,7 +303,7 @@
throw new FTPConnectionClosedException(
Connection closed without indication.);
-_replyLines.addElement(line);
+_replyLines.add(line);
// The length() check handles problems that could arise from
readLine
svn commit: r441556 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
Author: rwinston Date: Fri Sep 8 09:36:41 2006 New Revision: 441556 URL: http://svn.apache.org/viewvc?view=revrev=441556 Log: Add javadocs report Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?view=diffrev=441556r1=441555r2=441556 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Fri Sep 8 09:36:41 2006 @@ -263,6 +263,14 @@ /reportSet /reportSets /plugin + + plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-javadoc-plugin/artifactId + configuration + /configuration + /plugin + /plugins /reporting - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r440725 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp: DefaultFTPFileListParser.java FTPClient.java FTPFileEntryParserImpl.java FTPFileL
Author: rwinston
Date: Wed Sep 6 07:33:59 2006
New Revision: 440725
URL: http://svn.apache.org/viewvc?view=revrev=440725
Log:
Remove deprecated classes and methods
Removed:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/DefaultFTPFileListParser.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileListParser.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileListParserImpl.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?view=diffrev=440725r1=440724r2=440725
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Wed Sep 6 07:33:59 2006
@@ -2460,203 +2460,7 @@
return null;
}
-/**
- * Using a programmer specified code FTPFileListParser /code, obtain a
- * list of file information for a directory or information for
- * just a single file. This information is obtained through the LIST
- * command. The contents of the returned array is determined by the
- * code FTPFileListParser /code used.
- * The server may or may not expand glob expressions. You should avoid
- * using glob expressions because the return format for glob listings
- * differs from server to server and will likely cause this method to fail.
- * p
- * @param parser The code FTPFileListParser /code that should be
- * used to parse the server file listing.
- * @param pathname The file or directory to list.
- * @return The list of file information contained in the given path in
- * the format determined by the code parser /code parameter.
- * pb
- *NOTE:/b This array may contain null members if any
of the
- * individual file listings failed to parse. The caller should
- * check each entry for null before referencing it.
- * @exception FTPConnectionClosedException
- * If the FTP server prematurely closes the connection as a result
- * of the client being idle or some other reason causing the server
- * to send FTP reply code 421. This exception may be caught either
- * as an IOException or independently as itself.
- * @exception IOException If an I/O error occurs while either sending a
- * command to the server or receiving a reply from the server.
- *
- * @return The list of file information contained in the given path in
- * the format determined bycode parserKey /codeparameter.
- * pb
- *NOTE:/b This array may contain null members if any
of the
- * individual file listings failed to parse. The caller should
- * check each entry for null before referencing it.
- *
- * @exception IOException
- * @since 5 Jan 2004
- * @deprecated use listFiles(String parserKey, String pathname) instead
- */
-public FTPFile[] listFiles(FTPFileListParser parser, String pathname)
-throws IOException
-{
-Socket socket;
-FTPFile[] results;
-if ((socket = _openDataConnection_(FTPCommand.LIST,
getListArguments(pathname))) == null)
-return new FTPFile[0];
-
-results = parser.parseFileList(socket.getInputStream(),
getControlEncoding());
-
-socket.close();
-
-completePendingCommand();
-
-return results;
-}
-
-
-/**
- * Using a programmer specified code FTPFileListParser /code,
- * obtain a list of file information for the current working directory.
- * This information is obtained through the LIST command.
- * The contents of the array returned is determined by the
- * code FTPFileListParser /code used.
- * p
- *
- * @param parser The code FTPFileListParser /code that should be
- * used to parse the server file listing.
- *
- * @return The list of file information contained in the given path in
- * the format determined by the code parser /code parameter.
- * pb
- *NOTE:/b This array may contain null members if any
of the
- * individual file listings failed to parse
svn commit: r440728 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
Author: rwinston Date: Wed Sep 6 07:38:15 2006 New Revision: 440728 URL: http://svn.apache.org/viewvc?view=revrev=440728 Log: Remove deprecated classes Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diffrev=440728r1=440727r2=440728 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Wed Sep 6 07:38:15 2006 @@ -94,6 +94,10 @@ action dev=rwinston type=update Added heavily updated MVSFTPEntryParser from lt;[EMAIL PROTECTED]gt; /action + action dev=rwinston type=remove + Removed deprecated classes FTPFileListParser, FTPFileListParserImpl, and DefaultFTPFileListParser. Also + removed associated deprecated methods from FTPClient. + /action /release - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r439984 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: assembly-bin.xml assembly-src.xml pom.xml
Author: rwinston
Date: Mon Sep 4 01:54:31 2006
New Revision: 439984
URL: http://svn.apache.org/viewvc?view=revrev=439984
Log:
Add assembly info
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
Added: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml?view=autorev=439984
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml (added)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-bin.xml Mon Sep
4 01:54:31 2006
@@ -0,0 +1,24 @@
+assembly
+ idbin/id
+ formats
+ formattar.gz/format
+ formattar.bz2/format
+ formatzip/format
+ /formats
+ fileSets
+ fileSet
+ includes
+ includeREADME*/include
+ includeLICENSE*/include
+ includeNOTICE*/include
+ /includes
+ /fileSet
+ fileSet
+ directorytarget/directory
+ outputDirectory/outputDirectory
+ includes
+ include*.jar/include
+ /includes
+ /fileSet
+ /fileSets
+/assembly
Added: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml?view=autorev=439984
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml (added)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/assembly-src.xml Mon Sep
4 01:54:31 2006
@@ -0,0 +1,22 @@
+assembly
+ idsrc/id
+ formats
+formattar.gz/format
+formattar.bz2/format
+formatzip/format
+ /formats
+ fileSets
+fileSet
+ includes
+includeREADME*/include
+includeLICENSE*/include
+includeNOTICE*/include
+includepom.xml/include
+ /includes
+/fileSet
+fileSet
+ directorysrc/directory
+/fileSet
+ /fileSets
+/assembly
+
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?view=diffrev=439984r1=439983r2=439984
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Mon Sep 4
01:54:31 2006
@@ -170,6 +170,7 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-surefire-plugin/artifactId
+ version2.2/version
configuration
excludes
exclude**/*FunctionalTest.java/exclude
@@ -178,6 +179,20 @@
/excludes
/configuration
/plugin
+
+ plugin
+ artifactIdmaven-assembly-plugin/artifactId
+ configuration
+ descriptors
+
descriptorassembly-src.xml/descriptor
+
descriptorassembly-bin.xml/descriptor
+ /descriptors
+
finalNamecommons-net-${version}/finalName
+
outputDirectorytarget/outputDirectory
+
workDirectorytarget/assembly/workDirectory
+ /configuration
+ /plugin
+
plugin
artifactIdmaven-antrun-plugin/artifactId
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r440138 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
Author: rwinston Date: Mon Sep 4 11:01:57 2006 New Revision: 440138 URL: http://svn.apache.org/viewvc?view=revrev=440138 Log: Fix versions Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diffrev=440138r1=440137r2=440138 == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml Mon Sep 4 11:01:57 2006 @@ -97,7 +97,7 @@ /release - release version=1.5.0 date= description= + !--release version=1.5.0 date= description= action dev=dfs type=fix Applied Rob Hasselbaum's lt;rhasselbaum - alumni.ithaca.edugt; @@ -120,7 +120,8 @@ Added an FTP parser for Netware FTP servers. /action /release - + -- + release version=1.4.1 date=December 3, 2005 description=fix release to restore jdk 1.3 compatability action dev=scohen type=fix Applied patches for defect 37113. Code incompatible with jdk 1.3. Original patch submitted by lt;Andrea Rombaldgt; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r439808 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: pom.xml src/site/xdoc/changes.xml src/site/xdoc/index.xml
Author: rwinston
Date: Sun Sep 3 10:22:31 2006
New Revision: 439808
URL: http://svn.apache.org/viewvc?view=revrev=439808
Log:
Add some notes and entries to the manifest
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/index.xml
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?view=diffrev=439808r1=439807r2=439808
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Sun Sep 3
10:22:31 2006
@@ -52,9 +52,9 @@
distributionManagement
site
- idwebsite/id
+ idtaging/id
nameApache Website/name
-
urlscp://people.apache.org/www/jakarta.apache.org/commons/proper/net//url
+
urlscp://people.apache.org/~rwinston/release/net//url
/site
/distributionManagement
@@ -191,7 +191,11 @@
includes=org/apache/commons/net/ftp/**,org/apache/commons/net/*,org/apache/commons/net/io/*,org/apache/commons/net/util/*/
fileset dir=${basedir} includes=LICENSE.txt/
manifest
-
attribute name=Implementation-Vendor value=Apache Software Foundation/
+
attribute name=Extension-Name value=org.apache.commons.net/
+
attribute name=Specification-Title value=Jakarta Commons Net/
+
attribute name=Specification-Vendor value=The Apache Software Foundation/
+
attribute name=Specification-Version value=2.0/
+
/manifest
/jar
/tasks
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?view=diffrev=439808r1=439807r2=439808
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
Sun Sep 3 10:22:31 2006
@@ -97,7 +97,7 @@
/release
- release version=1.5 date= description=
+ release version=1.5.0 date= description=
action dev=dfs type=fix
Applied Rob Hasselbaum's
lt;rhasselbaum - alumni.ithaca.edugt;
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/index.xml?view=diffrev=439808r1=439807r2=439808
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/index.xml
(original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/index.xml
Sun Sep 3 10:22:31 2006
@@ -69,7 +69,8 @@
to the continued development of Jakarta Commons Net. The current
version numbering scheme bears no relation to the old. In other
words, Jakarta Commons Net 1.0 succeeded and supplanted
-NetComponents 1.3.8.
+NetComponents 1.3.8. The 2.0 branch of Commons Net will only run on
+JDK 5.0 or higher.
/p
/section
section name=Further Information
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r439561 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml
Author: rwinston Date: Sat Sep 2 02:05:30 2006 New Revision: 439561 URL: http://svn.apache.org/viewvc?rev=439561view=rev Log: Remove redundant flag Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml?rev=439561r1=439560r2=439561view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml Sat Sep 2 02:05:30 2006 @@ -88,6 +88,9 @@ Custom SocketFactory interface has been replaced with the JDK SocketFactory implementation. Added ServerSocketFactory instance to SocketClient. /action + action dev=rwinston type=update + Removed redundant FTP.IMAGE_FILE_TYPE flag. + /action /release - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r439562 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site: ./ navigation.xml
Author: rwinston Date: Sat Sep 2 02:07:05 2006 New Revision: 439562 URL: http://svn.apache.org/viewvc?rev=439562view=rev Log: Add navigation.xml Added: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/navigation.xml - copied unchanged from r437386, jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/navigation.xml - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r439563 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site: navigation.xml site.xml
Author: rwinston Date: Sat Sep 2 02:07:38 2006 New Revision: 439563 URL: http://svn.apache.org/viewvc?rev=439563view=rev Log: Rename to site.xml Added: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml - copied unchanged from r439562, jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/navigation.xml Removed: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/navigation.xml - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r439575 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site: apt/ fml/ site.xml xdoc/ xdoc/changes.xml xdoc/index.xml xdoc/navigation.xml
Author: rwinston Date: Sat Sep 2 04:33:00 2006 New Revision: 439575 URL: http://svn.apache.org/viewvc?rev=439575view=rev Log: Add site content in Maven 2 format Added: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/apt/ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/fml/ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/ - copied from r437386, jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml - copied unchanged from r439561, jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/index.xml - copied unchanged from r438622, jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/index.xml Removed: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/navigation.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml?rev=439575r1=439574r2=439575view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml Sat Sep 2 04:33:00 2006 @@ -15,10 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. -- -project name=Jakarta Commons/Net - - titleJakarta Commons/Net/title - +site body menu name=Documentation item name=Migration How-to href=/migration.html/ @@ -31,8 +28,6 @@ item name=To-Do List href=/tasks.html/ item name=Coding Specifications href=/code-standards.html/ /menu - - common-menus; /body -/project +/site - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r439576 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml
Author: rwinston
Date: Sat Sep 2 04:48:51 2006
New Revision: 439576
URL: http://svn.apache.org/viewvc?rev=439576view=rev
Log:
Add reports
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml?rev=439576r1=439575r2=439576view=diff
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml
(original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/site.xml Sat
Sep 2 04:48:51 2006
@@ -1,5 +1,4 @@
?xml version=1.0 encoding=ISO-8859-1?
-!DOCTYPE org.apache.commons.menus SYSTEM
'../../commons-build/menus/menus.dtd'
!--
Copyright 2003-2004 The Apache Software Foundation
@@ -15,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--
-site
+project name=Jakarta Commons Net
body
menu name=Documentation
item name=Migration How-to href=/migration.html/
@@ -28,6 +27,9 @@
item name=To-Do List href=/tasks.html/
item name=Coding Specifications href=/code-standards.html/
/menu
+
+${reports}
+
/body
-/site
+/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r439577 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: pom.xml xdocs/
Author: rwinston
Date: Sat Sep 2 04:50:23 2006
New Revision: 439577
URL: http://svn.apache.org/viewvc?rev=439577view=rev
Log:
Remove top-level xdocs and fix reference to changes.xml
Removed:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?rev=439577r1=439576r2=439577view=diff
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Sat Sep 2
04:50:23 2006
@@ -19,18 +19,18 @@
nameJakarta Commons Net/name
groupIdcommons-net/groupId
-artifactIdcommons-net/artifactId
+ artifactIdcommons-net/artifactId
version2.0.0-SNAPSHOT/version
inceptionYear1997/inceptionYear
descriptionJakarta Commons Net/description
-
+
pluginRepositories
-pluginRepository
- idsnapshots/id
- urlhttp://people.apache.org/maven-snapshot-repository//url
-/pluginRepository
- /pluginRepositories
-
+ pluginRepository
+ idsnapshots/id
+
urlhttp://people.apache.org/maven-snapshot-repository//url
+ /pluginRepository
+ /pluginRepositories
+
urlhttp://jakarta.apache.org/commons/${pom.artifactId.substring(8)}//url
organization
@@ -49,30 +49,30 @@
issueManagement
urlhttps://issues.apache.org/jira/browse/NET/url
/issueManagement
-
+
distributionManagement
-site
- idwebsite/id
- nameApache Website/name
-
urlscp://people.apache.org/www/jakarta.apache.org/commons/proper/net//url
-/site
- /distributionManagement
-
- repositories
- repository
- idjakarta/id
-
urlhttp://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/url
- /repository
- /repositories
-
- dependencies
- dependency
- groupIdjunit/groupId
- artifactIdjunit/artifactId
- version3.8.1/version
- scopetest/scope
- /dependency
- /dependencies
+ site
+ idwebsite/id
+ nameApache Website/name
+
urlscp://people.apache.org/www/jakarta.apache.org/commons/proper/net//url
+ /site
+ /distributionManagement
+
+ repositories
+ repository
+ idjakarta/id
+
urlhttp://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/url
+ /repository
+ /repositories
+
+ dependencies
+ dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ version3.8.1/version
+ scopetest/scope
+ /dependency
+ /dependencies
mailingLists
mailingList
@@ -113,7 +113,7 @@
iddfs/id
emaildfs - apache.org/email
organization
- lt;a href=http://www.savarese.com/gt;Savarese
Software Researchlt;/agt;
+ lt;a
href=http://www.savarese.com/gt;Savarese Software Researchlt;/agt;
/organization
/developer
developer
@@ -147,13 +147,13 @@
email[EMAIL PROTECTED]/email
/contributor
/contributors
-
+
scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/developerConnection
- urlhttp://svn.apache.org/viewvc/jakarta/commons/proper/net/trunk/url
- /scm
-
+
connectionscm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/developerConnection
+
urlhttp://svn.apache.org/viewvc/jakarta/commons/proper/net/trunk/url
+ /scm
+
build
plugins
@@ -166,45 +166,45 @@
target1.5/target
/configuration
/plugin
-
- plugin
- groupIdorg.apache.maven.plugins/groupId
- artifactIdmaven-surefire-plugin/artifactId
- configuration
- excludes
- exclude**/*FunctionalTest.java/exclude
-
exclude
svn commit: r439598 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: main/java/examples/FTPSExample.java main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java test/java/org/a
Author: rwinston
Date: Sat Sep 2 06:44:52 2006
New Revision: 439598
URL: http://svn.apache.org/viewvc?rev=439598view=rev
Log:
Added new MVSFTPEntryParser.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java?rev=439598r1=439597r2=439598view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
Sat Sep 2 06:44:52 2006
@@ -53,6 +53,7 @@
int base = 0;
boolean storeFile = false, binaryTransfer = false, error = false;
String server, username, password, remote, local;
+String protocol = SSL; // SSL/TLS
FTPSClient ftps;
for (base = 0; base args.length; base++)
@@ -77,7 +78,7 @@
remote = args[base++];
local = args[base];
-ftps = new FTPSClient();
+ftps = new FTPSClient(protocol);
ftps.addProtocolCommandListener(new PrintCommandListener(new
PrintWriter(System.out)));
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java?rev=439598r1=439597r2=439598view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
Sat Sep 2 06:44:52 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 The Apache Software Foundation
+ * Copyright 2001-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -22,221 +22,215 @@
import org.apache.commons.net.ftp.FTPFile;
/**
- * Implementation of FTPFileEntryParser and FTPFileListParser for IBM zOS/MVS
Systems.
- *
- * @author a href=[EMAIL PROTECTED]Henrik Sorensen/a
+ * Implementation of FTPFileEntryParser and FTPFileListParser for IBM zOS/MVS
+ * Systems.
*
- * wagely based on earlier work done by:
+ * @author a href=[EMAIL PROTECTED]Henrik Sorensen/a
* @author a href=[EMAIL PROTECTED]Jeff Nadler/a
* @author a href=[EMAIL PROTECTED]William Noto/a
-
+ *
* @version $Id$
- * @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for
usage instructions)
+ * @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for
+ * usage instructions)
*/
public class MVSFTPEntryParser extends ConfigurableFTPFileEntryParserImpl {
- private static final boolean DEBUG_PARSER = true; // false;
- public static final int UNKNOWN_LIST_TYPE = -1;
- public static final int FILE_LIST_TYPE = 0;
- public static final int MEMBER_LIST_TYPE = 1;
- public static final int UNIX_LIST_TYPE = 2;
- public static final int JES_LEVEL1_LIST_TYPE = 3;
- public static final int JES_LEVEL2_LIST_TYPE = 4;
+ static final int UNKNOWN_LIST_TYPE = -1;
+ static final int FILE_LIST_TYPE = 0;
+ static final int MEMBER_LIST_TYPE = 1;
+ static final int UNIX_LIST_TYPE = 2;
+ static final int JES_LEVEL_1_LIST_TYPE = 3;
+ static final int JES_LEVEL_2_LIST_TYPE = 4;
+
private int isType = UNKNOWN_LIST_TYPE;
+ /**
+* Fallback parser for Unix-style listings
+*/
private UnixFTPEntryParser unixFTPEntryParser;
/**
-* Dates are ignored for file lists, but are used for member
-* lists where possible
+* Dates are ignored for file lists, but are used for member lists where
+* possible
*/
- static final String DEFAULT_DATE_FORMAT = /MM/dd HH:mm; //
2001/09/18 13:52
+ static final String DEFAULT_DATE_FORMAT = /MM/dd HH:mm; //
2001/09/18
+
// 13:52
/**
-* Matches these entries:
-* Volume UnitReferred Ext Used Recfm
svn commit: r439614 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: site/xdoc/changes.xml test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
Author: rwinston
Date: Sat Sep 2 09:25:58 2006
New Revision: 439614
URL: http://svn.apache.org/viewvc?rev=439614view=rev
Log:
Remove redundant collection
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml?rev=439614r1=439613r2=439614view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/site/xdoc/changes.xml
Sat Sep 2 09:25:58 2006
@@ -91,6 +91,9 @@
action dev=rwinston type=update
Removed redundant FTP.IMAGE_FILE_TYPE flag.
/action
+ action dev=rwinston type=update
+ Added heavily updated MVSFTPEntryParser from
lt;[EMAIL PROTECTED]gt;
+ /action
/release
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java?rev=439614r1=439613r2=439614view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
Sat Sep 2 09:25:58 2006
@@ -34,7 +34,6 @@
* @version $Id: MVSFTPEntryParserTest.java,v 1.16 2005/01/02 03:17:50 scohen
Exp $
*/
public class MVSFTPEntryParserTest extends FTPParseTestFramework {
- static List saveftpfiles;
private static final String[] goodsamplesDatasetList = { /* Note, if
the string begins with SAVE, the parsed entry is stored in the List
saveftpfiles */
// Volume UnitReferred Ext Used Recfm Lrecl
BlkSz Dsorg Dsname,
@@ -110,15 +109,6 @@
return l;
}
- /**
-* @see
org.apache.commons.net.ftp.parser.FTPParseTestFramework#doAdditionalGoodTests()
-*/
- /* Add the parsed files for more testing later */
- protected void doAdditionalGoodTests(String test, FTPFile f) {
- if (test.startsWith(SAVE)) { //System.out.println(saving
ftpfile name =+f.getName());
- saveftpfiles.add(f);
- }
- }
/**
* @see
org.apache.commons.net.ftp.parser.FTPParseTestFramework#getParser()
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r439615 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
Author: rwinston
Date: Sat Sep 2 09:26:26 2006
New Revision: 439615
URL: http://svn.apache.org/viewvc?rev=439615view=rev
Log:
Remove redundant collection
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java?rev=439615r1=439614r2=439615view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
Sat Sep 2 09:26:26 2006
@@ -78,8 +78,7 @@
*/
public MVSFTPEntryParserTest(String name) {
super(name);
- if (saveftpfiles == null)
- saveftpfiles = new ArrayList();
+
}
/* (non-Javadoc)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438865 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
Author: rwinston Date: Thu Aug 31 04:26:45 2006 New Revision: 438865 URL: http://svn.apache.org/viewvc?rev=438865view=rev Log: Removed redundant IMAGE_TYPE flag Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java?rev=438865r1=438864r2=438865view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java Thu Aug 31 04:26:45 2006 @@ -113,14 +113,7 @@ ***/ public static final int EBCDIC_FILE_TYPE = 1; -/*** - * A constant used to indicate the file(s) being transfered should - * be treated as a binary image, i.e., no translations should be - * performed. All constants ending in codeFILE_TYPE/code are used to - * indicate file types. - ***/ -public static final int IMAGE_FILE_TYPE = 2; - + /*** * A constant used to indicate the file(s) being transfered should * be treated as a binary image, i.e., no translations should be - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438414 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Author: rwinston
Date: Wed Aug 30 01:05:49 2006
New Revision: 438414
URL: http://svn.apache.org/viewvc?rev=438414view=rev
Log:
Mark TODO and fix method name
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=438414r1=438413r2=438414view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Wed Aug 30 01:05:49 2006
@@ -234,7 +234,7 @@
* this is the default.
* false - indicates that an existing session must be resumed.
*/
-public boolean getEnableSeeionCreation() {
+public boolean getEnableSessionCreation() {
if (_socket_ instanceof SSLSocket)
return ((SSLSocket)_socket_).getEnableSessionCreation();
return false;
@@ -411,6 +411,7 @@
int repCode = super.sendCommand(command, args);
if (FTPSCommand._commands[FTPSCommand.CCC].equals(command)) {
if (FTPSReply.COMMAND_OK == repCode) {
+ // TODO Check this - is this necessary at all?
_socket_ = planeSocket;
setSocketFactory(null);
} else {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438459 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net: ./ bsd/ ftp/
Author: rwinston
Date: Wed Aug 30 04:04:26 2006
New Revision: 438459
URL: http://svn.apache.org/viewvc?rev=438459view=rev
Log:
* Refactor SocketClient to use JDK SocketClient
* DatagramSocketClient still uses commons-net impl
* Added default ServerSocketFactory
* Merged FTPSReply.java into FTPReply.java and removed
Removed:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/DefaultSocketFactory.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/bsd/RExecClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPReply.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/DefaultSocketFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/DefaultSocketFactory.java?rev=438459r1=438458r2=438459view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/DefaultSocketFactory.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/DefaultSocketFactory.java
Wed Aug 30 04:04:26 2006
@@ -21,6 +21,8 @@
import java.net.Socket;
import java.net.UnknownHostException;
+import javax.net.SocketFactory;
+
/***
* DefaultSocketFactory implements the SocketFactory interface by
* simply wrapping the java.net.Socket and java.net.ServerSocket
@@ -35,7 +37,7 @@
* @see SocketClient#setSocketFactory
***/
-public class DefaultSocketFactory implements SocketFactory
+public class DefaultSocketFactory extends SocketFactory
{
/***
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java?rev=438459r1=438458r2=438459view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
Wed Aug 30 04:04:26 2006
@@ -22,6 +22,10 @@
import java.net.Socket;
import java.net.SocketException;
+import javax.net.ServerSocketFactory;
+import javax.net.SocketFactory;
+
+
/**
* The SocketClient provides the basic operations that are required of
* client objects accessing sockets. It is meant to be
@@ -53,7 +57,10 @@
/** The default SocketFactory shared by all SocketClient instances. */
private static final SocketFactory __DEFAULT_SOCKET_FACTORY =
-new DefaultSocketFactory();
+ SocketFactory.getDefault();
+
+private static final ServerSocketFactory __DEFAULT_SERVER_SOCKET_FACTORY =
+ ServerSocketFactory.getDefault();
/** The timeout to use after opening a socket. */
protected int _timeout_;
@@ -77,6 +84,8 @@
/** The socket's SocketFactory. */
protected SocketFactory _socketFactory_;
+
+protected ServerSocketFactory _serverSocketFactory_;
/**
@@ -499,6 +508,21 @@
else
_socketFactory_ = factory;
}
+
+/**
+ * Sets the ServerSocketFactory used by the SocketClient to open
ServerSocket
+ * connections. If the factory value is null, then a default
+ * factory is used (only do this to reset the factory after having
+ * previously altered it).
+ * p
+ * @param factory The new ServerSocketFactory the SocketClient should use.
+ */
+public void setServerSocketFactory(ServerSocketFactory factory) {
+ if (factory == null)
+ _serverSocketFactory_ = __DEFAULT_SERVER_SOCKET_FACTORY;
+ else
+ _serverSocketFactory_ = factory;
+ }
}
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net
svn commit: r438471 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
Author: rwinston Date: Wed Aug 30 04:54:36 2006 New Revision: 438471 URL: http://svn.apache.org/viewvc?rev=438471view=rev Log: Set ServerSocketFactory in constructor Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java?rev=438471r1=438470r2=438471view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java Wed Aug 30 04:54:36 2006 @@ -85,9 +85,9 @@ /** The socket's SocketFactory. */ protected SocketFactory _socketFactory_; +/** The socket's ServerSocket Factory. */ protected ServerSocketFactory _serverSocketFactory_; - /** * Default constructor for SocketClient. Initializes * _socket_ to null, _timeout_ to 0, _defaultPort to 0, @@ -103,6 +103,7 @@ _defaultPort_ = 0; _isConnected_ = false; _socketFactory_ = __DEFAULT_SOCKET_FACTORY; +_serverSocketFactory_ = __DEFAULT_SERVER_SOCKET_FACTORY; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438604 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: pom.xml src/main/java/org/apache/commons/net/SocketFactory.java src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntr
Author: rwinston
Date: Wed Aug 30 12:53:54 2006
New Revision: 438604
URL: http://svn.apache.org/viewvc?rev=438604view=rev
Log:
* Fix JIRA report
* Add some issue numbers
* Update some changes
Removed:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketFactory.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?rev=438604r1=438603r2=438604view=diff
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Wed Aug 30
12:53:54 2006
@@ -233,6 +233,7 @@
artifactIdmaven-changes-plugin/artifactId
configuration
xmlPath${basedir}/xdocs/changes.xml/xmlPath
+ issueLinkTemplate%URL%/%ISSUE%/issueLinkTemplate
/configuration
reportSets
reportSet
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java?rev=438604r1=438603r2=438604view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java
Wed Aug 30 12:53:54 2006
@@ -15,103 +15,535 @@
*/
package org.apache.commons.net.ftp.parser;
+import java.text.ParseException;
+import java.util.List;
+
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
/**
- * Implementation of FTPFileEntryParser and FTPFileListParser for IBM MVS
Systems.
+ * Implementation of FTPFileEntryParser and FTPFileListParser for IBM zOS/MVS
Systems.
*
+ * @author a href=[EMAIL PROTECTED]Henrik Sorensen/a
+ *
+ * wagely based on earlier work done by:
* @author a href=[EMAIL PROTECTED]Jeff Nadler/a
* @author a href=[EMAIL PROTECTED]William Noto/a
+
* @version $Id$
* @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for
usage instructions)
*/
-public class MVSFTPEntryParser extends ConfigurableFTPFileEntryParserImpl
-{
-/**
- * This is the regular expression used by this parser.
- */
- private static final String REGEX = (.*)\\s+([^\\s]+)\\s*;
+public class MVSFTPEntryParser extends ConfigurableFTPFileEntryParserImpl {
+ private static final boolean DEBUG_PARSER = true; // false;
+
+ public static final int UNKNOWN_LIST_TYPE = -1;
+ public static final int FILE_LIST_TYPE = 0;
+ public static final int MEMBER_LIST_TYPE = 1;
+ public static final int UNIX_LIST_TYPE = 2;
+ public static final int JES_LEVEL1_LIST_TYPE = 3;
+ public static final int JES_LEVEL2_LIST_TYPE = 4;
+ private int isType = UNKNOWN_LIST_TYPE;
+
+ private UnixFTPEntryParser unixFTPEntryParser;
+
+ /**
+* Dates are ignored for file lists, but are used for member
+* lists where possible
+*/
+ static final String DEFAULT_DATE_FORMAT = /MM/dd HH:mm; //
2001/09/18 13:52
+
+ /**
+* Matches these entries:
+* Volume UnitReferred Ext Used Recfm Lrecl BlkSz Dsorg Dsname
+* B10142 3390 2006/03/20 2 31 F 8080 PS
MDI.OKL.WORK
+*
+*/
+ /*public static final String REGEX_FILELIST = \\S+\\s+ + //volume
ignored
+ \\S+\\s+ + //unit - ignored
+ \\S+\\s+ + //access date - ignored
+ \\S+\\s+ + //extents -ignored
+ \\S+\\s+ + //used - ignored
+ [FV]\\S*\\s+ + //recfm - must start with F or V
+ \\S+\\s+ + //logical record length -ignored
+ \\S+\\s+ + //block size - ignored
+ (PS|PO|PO-E)\\s+ + // Dataset organisation. Many exist
+ //but only support: PS, PO, PO-E
+ (\\S+)\\s*; // Dataset Name (file name)*/
+ public static final String REGEX_FILELIST = (.*)\\s+([^\\s]+)\\s*;
+
+ /**
+* Matches these entries:
+* Name VV.MM Created Changed Size Init Mod Id
+* TBSHELF 01.03 2002/09/12 2002/10/11 09:371111 0
KIL001
+*/
+ private static final String REGEX_MEMBERLIST = (\\S+)\\s+ + //name
+ \\S+\\s+ + //version, modification (ignored)
+ \\S+\\s
svn commit: r438622 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/index.xml
Author: rwinston Date: Wed Aug 30 14:01:28 2006 New Revision: 438622 URL: http://svn.apache.org/viewvc?rev=438622view=rev Log: Add link to index page Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/index.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/index.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/index.xml?rev=438622r1=438621r2=438622view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/index.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/index.xml Wed Aug 30 14:01:28 2006 @@ -77,8 +77,9 @@ For more info, see the JavaDoc, or look at some of the following articles: ul lia href=http://www.informit.com/guides/content.asp?g=javaamp;seqNum=40;http://www.informit.com/guides/content.asp?g=javaamp;seqNum=40/a/li - lia href=http://www.onjava.com/pub/a/onjava/2003/06/25/commons.html?page=3;http://www.onjava.com/pub/a/onjava/2003/06/25/commons.html?page=3/a/li - /ul + lia href=http://www.onjava.com/pub/a/onjava/2003/06/25/commons.html?page=3;http://www.onjava.com/pub/a/onjava/2003/06/25/commons.html?page=3/a/li + lia href=http://safari.phptr.com/0131478303/ch04;http://safari.phptr.com/0131478303/ch04/a/li + /ul /p /section /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438203 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: src/main/java/org/apache/commons/net/ftp/FTPSClient.java src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntry
Author: rwinston
Date: Tue Aug 29 13:47:29 2006
New Revision: 438203
URL: http://svn.apache.org/viewvc?rev=438203view=rev
Log:
* Clean up FTPSClient.java slightly
* Refactor changeRegex() to setRegex() in RegexFTPFileEntryParserImpl.java
* Document some more changes
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=438203r1=438202r2=438203view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Tue Aug 29 13:47:29 2006
@@ -19,27 +19,15 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
-import java.net.InetAddress;
import java.net.Socket;
-import java.net.SocketException;
import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.util.Enumeration;
-import java.util.Vector;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
/**
* FTP over SSL processing.
@@ -68,10 +56,6 @@
private String protocol = DEFAULT_PROTOCOL;
/** The AUTH Command value */
private String auth = DEFAULT_PROTOCOL;
-/** The KeyManager object. */
-private KeyManager[] keyManager = null;
-/** The TrustManager object */
-private TrustManager[] trustManager = null;
/** The context object. */
private SSLContext context;
/** The socket object. */
@@ -138,116 +122,8 @@
context = SSLContext.getInstance(protocol);
}
-/**
- * Create KeyManager[] object.
- * @param ks The KeyStore objects.
- * @param storePass The Store password.
- * @throws NoSuchAlgorithmException A requested cryptographic
- * algorithm is not available in the environment.
- * @throws NoSuchProviderException A requested cryptographic provider
- * is not available in the environment.
- * @throws UnrecoverableKeyException This exception is thrown
- * if a key in the keystore cannot be recovered.
- * @throws KeyStoreException This is the generic KeyStore exception.
- * @throws KeyManagementException It is the generic KeyManager exception.
- */
-public void createKeyManager(KeyStore ks, String storePass)
-throws NoSuchAlgorithmException, NoSuchProviderException,
-KeyStoreException,UnrecoverableKeyException,KeyManagementException{
-if (ks == null) {
-keyManager = null;
-return;
-}
-if (KEYSTORE_ALGORITHM == null)
-KEYSTORE_ALGORITHM = KeyManagerFactory.getDefaultAlgorithm();
-KeyManagerFactory kmf;
-if (PROVIDER == null) {
-kmf = KeyManagerFactory.getInstance(KEYSTORE_ALGORITHM);
-} else {
-kmf = KeyManagerFactory.getInstance(KEYSTORE_ALGORITHM, PROVIDER);
-}
-if (kmf == null) {
-keyManager = null;
-return;
-}
-kmf.init(ks, storePass.toCharArray());
-keyManager = kmf.getKeyManagers();
-context.init(keyManager, trustManager, null);
-}
-
-/**
- * Create TrustManager[] object.
- * @param ks The KeyStore object.
- * @throws NoSuchAlgorithmException A requested cryptographic algorithm
- * is not available in the environment.
- * @throws NoSuchProviderException A requested cryptographic provider
- * is not available in the environment.
- * @throws KeyStoreException This is the generic KeyStore exception.
- * @throws KeyManagementException It is the generic KeyManager exception.
- */
-public void createTrustManager(KeyStore ks)
-throws NoSuchAlgorithmException, NoSuchProviderException,
-KeyStoreException, KeyManagementException {
-if (ks == null) trustManager = null;
-if (TRUSTSTORE_ALGORITHM == null
svn commit: r438206 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
Author: rwinston
Date: Tue Aug 29 13:53:47 2006
New Revision: 438206
URL: http://svn.apache.org/viewvc?rev=438206view=rev
Log:
Clean up FTPSReply.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java?rev=438206r1=438205r2=438206view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
Tue Aug 29 13:53:47 2006
@@ -14,8 +14,12 @@
*/
package org.apache.commons.net.ftp;
+
/**
- * I confirm a response cord of a command added in FTPS.
+ * FTPS Response codes and status checking. Just delegates to [EMAIL
PROTECTED] FTPReply} for now.
+ *
+ * @version $Id$
+ * @see [EMAIL PROTECTED] FTPReply}
*/
public final class FTPSReply {
public static final int CODE_200 = 200;
@@ -67,7 +71,7 @@
* false if not.
*/
public static boolean isPositivePreliminary(int reply) {
-return (reply = 100 reply 200);
+return FTPReply.isPositivePreliminary(reply);
}
/**
@@ -81,7 +85,7 @@
* false if not.
*/
public static boolean isPositiveCompletion(int reply) {
-return (reply = 200 reply 300);
+return FTPReply.isPositiveCompletion(reply);
}
/**
@@ -98,7 +102,7 @@
* false if not.
*/
public static boolean isPositiveIntermediate(int reply) {
-return (reply = 300 reply 400);
+return FTPReply.isPositiveIntermediate(reply);
}
/**
@@ -112,7 +116,7 @@
* false if not.
*/
public static boolean isNegativeTransient(int reply) {
-return (reply = 400 reply 500);
+return FTPReply.isNegativeTransient(reply);
}
/**
@@ -126,6 +130,6 @@
* false if not.
*/
public static boolean isNegativePermanent(int reply) {
-return (reply = 500 reply 600);
+return FTPReply.isNegativePermanent(reply);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438210 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp: FTPSClient.java FTPSTrustManager.java
Author: rwinston
Date: Tue Aug 29 13:56:17 2006
New Revision: 438210
URL: http://svn.apache.org/viewvc?rev=438210view=rev
Log: (empty)
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=438210r1=438209r2=438210view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Tue Aug 29 13:56:17 2006
@@ -31,6 +31,8 @@
/**
* FTP over SSL processing.
+ *
+ * @version $Id$
*/
public class FTPSClient extends FTPClient {
@@ -122,8 +124,6 @@
context = SSLContext.getInstance(protocol);
}
-
-
/**
* Set AUTH command use value.
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java?rev=438210r1=438209r2=438210view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
Tue Aug 29 13:56:17 2006
@@ -18,10 +18,20 @@
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
+import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
+/**
+ * Custom [EMAIL PROTECTED] TrustManager} implementation.
+ *
+ * @version $Id$
+ *
+ */
public class FTPSTrustManager implements X509TrustManager
{
+ /**
+* No-op
+*/
public void checkClientTrusted(X509Certificate[] certificates, String
authType)
{
return;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438215 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Author: rwinston
Date: Tue Aug 29 14:11:12 2006
New Revision: 438215
URL: http://svn.apache.org/viewvc?rev=438215view=rev
Log:
Props change
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(contents, props changed)
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=438215r1=438214r2=438215view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Tue Aug 29 14:11:12 2006
@@ -1,455 +1,456 @@
-/**
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.net.ftp;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.Socket;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-
-/**
- * FTP over SSL processing.
- *
- * @version $Id$
- */
-public class FTPSClient extends FTPClient {
-
-/** keystore algorithm name. */
-public static String KEYSTORE_ALGORITHM;
-/** truststore algorithm name. */
-public static String TRUSTSTORE_ALGORITHM;
-/** provider name. */
-public static String PROVIDER;
-/** truststore type. */
-public static String STORE_TYPE;
-
-/** The value that I can set in PROT command */
-private static final String[] PROT_COMMAND_VALUE = {C,E,S,P};
-/** Default PROT Command */
-private static final String DEFAULT_PROT = C;
-/** Default protocol name */
-private static final String DEFAULT_PROTOCOL = TLS;
-
-/** The security mode. (True - Implicit Mode / False - Explicit Mode) */
-private boolean isImplicit;
-/** The use SSL/TLS protocol. */
-private String protocol = DEFAULT_PROTOCOL;
-/** The AUTH Command value */
-private String auth = DEFAULT_PROTOCOL;
-/** The context object. */
-private SSLContext context;
-/** The socket object. */
-private Socket planeSocket;
-/** The established socket flag. */
-private boolean isCreation = true;
-/** The use client mode flag. */
-private boolean isClientMode = true;
-/** The need client auth flag. */
-private boolean isNeedClientAuth = false;
-/** The want client auth flag. */
-private boolean isWantClientAuth = false;
-/** The cipher suites */
-private String[] suites = null;
-/** The protocol versions */
-private String[] protocols = null;
-
-/**
- * Constructor for FTPSClient.
- * @throws NoSuchAlgorithmException A requested cryptographic algorithm
- * is not available in the environment.
- */
-public FTPSClient() throws NoSuchAlgorithmException {
-this.protocol = DEFAULT_PROTOCOL;
-this.isImplicit = false;
-context = SSLContext.getInstance(protocol);
-}
-
-/**
- * Constructor for FTPSClient.
- * @param isImplicit The secutiry mode(Implicit/Explicit).
- * @throws NoSuchAlgorithmException A requested cryptographic algorithm
- * is not available in the environment.
- */
-public FTPSClient(boolean isImplicit) throws NoSuchAlgorithmException {
-this.protocol = DEFAULT_PROTOCOL;
-this.isImplicit = isImplicit;
-context = SSLContext.getInstance(protocol);
-}
-
-/**
- * Constructor for FTPSClient.
- * @param conType The context type
- * @throws NoSuchAlgorithmException A requested cryptographic algorithm
- * is not available in the environment.
- */
-public FTPSClient(String protocol) throws NoSuchAlgorithmException {
-this.protocol = protocol;
-this.isImplicit = false;
-context = SSLContext.getInstance(protocol);
-}
-
-/**
- * Constructor for FTPSClient.
- * @param conType The context type
- * @param
svn commit: r437767 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: ./ src/main/java/examples/ src/main/java/examples/nntp/ src/main/java/org/apache/commons/net/ftp/
Author: rwinston
Date: Mon Aug 28 10:47:02 2006
New Revision: 437767
URL: http://svn.apache.org/viewvc?rev=437767view=rev
Log:
* Add an ant target to the maven pom.xml to generate a separate ftp-only jar
file
* Explicitly call init() in FTPSClient.java (need to clean this up)
More todo...
Removed:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/PrintCommandListener.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPExample.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/mail.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/ExtendedNNTPOps.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/MessageThreading.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/post.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/server2serverFTP.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?rev=437767r1=437766r2=437767view=diff
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Mon Aug 28
10:47:02 2006
@@ -168,16 +168,41 @@
/plugin
plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-surefire-plugin/artifactId
-configuration
- excludes
-exclude**/*FunctionalTest.java/exclude
- exclude**/TestSetupParameters.java/exclude
- exclude**/*POP3*.java/exclude
- /excludes
-/configuration
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-surefire-plugin/artifactId
+ configuration
+ excludes
+ exclude**/*FunctionalTest.java/exclude
+
exclude**/TestSetupParameters.java/exclude
+ exclude**/*POP3*.java/exclude
+ /excludes
+ /configuration
/plugin
+
+ plugin
+artifactIdmaven-antrun-plugin/artifactId
+executions
+ execution
+phasepackage/phase
+configuration
+ tasks
+ jar destfile=target/commons-net-ftp-${version}.jar
+ fileset dir=target/classes
+
includes=org/apache/commons/net/ftp/**,org/apache/commons/net/*,org/apache/commons/net/io/*,org/apache/commons/net/util/*/
+ fileset dir=${basedir} includes=LICENSE.txt/
+ manifest
+ attribute name=Implementation-Vendor
value=Apache Software Foundation/
+ /manifest
+ /jar
+ /tasks
+/configuration
+goals
+ goalrun/goal
+/goals
+ /execution
+/executions
+ /plugin
+
/plugins
resources
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPExample.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPExample.java?rev=437767r1=437766r2=437767view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPExample.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPExample.java
Mon Aug 28 10:47:02 2006
@@ -21,6 +21,8 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
+
+import org.apache.commons.net.PrintCommandListener;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPConnectionClosedException;
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java?rev=437767r1=437766r2=437767view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java
svn commit: r437355 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: src/main/java/examples/FTPSExample.java src/main/java/org/apache/commons/net/ftp/FTP.java src/main/java/org/apache/commons
Author: rwinston
Date: Sun Aug 27 03:06:55 2006
New Revision: 437355
URL: http://svn.apache.org/viewvc?rev=437355view=rev
Log:
NET-36 (experimental)
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java?rev=437355r1=437354r2=437355view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
Sun Aug 27 03:06:55 2006
@@ -77,8 +77,7 @@
local = args[base];
ftps = new FTPSClient();
-// NOTE this is necessary for FTPSClient connections
- ftps.setReaderThread(false);
+
ftps.addProtocolCommandListener(new PrintCommandListener(new
PrintWriter(System.out)));
try
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java?rev=437355r1=437354r2=437355view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
Sun Aug 27 03:06:55 2006
@@ -29,16 +29,12 @@
import org.apache.commons.net.ProtocolCommandListener;
import org.apache.commons.net.ProtocolCommandSupport;
import org.apache.commons.net.SocketClient;
-import org.apache.commons.net.telnet.TelnetClient;
/***
* FTP provides the basic the functionality necessary to implement your
- * own FTP client. It extends org.apache.commons.net.TelnetClient
- * simply because it saves the writing of extra code to handle the FTP
- * control connection which always remains open during an FTP session and
- * uses the Telnet protocol. Aggregation would require writing new
- * wrapper methods and wouldn't leverage the functionality already
- * present in org.apache.commons.net.SocketClient.
+ * own FTP client. It extends org.apache.commons.net.SocketClient since
+ * extending TelnetClient was causing unwanted behavior (like connections
+ * that did not time out properly).
* p
* To derive the full benefits of the FTP class requires some knowledge
* of the FTP protocol defined in RFC 959. However, there is no reason
@@ -88,12 +84,14 @@
* p
* p
* @author Daniel F. Savarese
+ * @author Joseph Hindsley
* @see FTPClient
* @see FTPConnectionClosedException
* @see org.apache.commons.net.MalformedServerReplyException
+ * @version $Id$
***/
-public class FTP extends TelnetClient
+public class FTP extends SocketClient
{
/*** The default FTP data port (20). ***/
public static final int DEFAULT_DATA_PORT = 20;
@@ -220,13 +218,13 @@
public static final String DEFAULT_CONTROL_ENCODING = ISO-8859-1;
private static final String __modes = AEILNTCFRPSBC;
-private StringBuffer __commandBuffer;
+private StringBuilder __commandBuffer = new StringBuilder();
-int _replyCode;
-Vector _replyLines;
-boolean _newReplyString;
-String _replyString;
-String _controlEncoding;
+protected int _replyCode;
+protected VectorString _replyLines;
+protected boolean _newReplyString;
+protected String _replyString;
+protected String _controlEncoding;
/**
* Wraps SocketClient._input_ to facilitate the writing of text
@@ -259,9 +257,9 @@
***/
public FTP()
{
+super();
setDefaultPort(DEFAULT_PORT);
-__commandBuffer = new StringBuffer();
-_replyLines = new Vector();
+_replyLines = new VectorString();
_newReplyString = false;
_replyString = null;
_commandSupport_ = new ProtocolCommandSupport(this);
@@ -328,12 +326,13 @@
// line.startsWith(code)));
}
-if (_commandSupport_.getListenerCount() 0)
+if (_commandSupport_.getListenerCount() 0) {
_commandSupport_.fireReplyReceived(_replyCode, getReplyString());
+}
-if (_replyCode == FTPReply.SERVICE_NOT_AVAILABLE)
-throw new FTPConnectionClosedException(
-FTP response 421 received. Server closed
svn commit: r437385 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: ./ src/main/java/org/apache/commons/net/ src/main/java/org/apache/commons/net/ftp/ src/main/java/org/apache/commons/net/ft
Author: rwinston
Date: Sun Aug 27 08:22:03 2006
New Revision: 437385
URL: http://svn.apache.org/viewvc?rev=437385view=rev
Log:
Apply some JIRA patches to bleeding edge branch
Removed:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/maven.xml
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/README
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/NTFTPEntryParserTest.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/index.xml
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/README
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/README?rev=437385r1=437384r2=437385view=diff
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/README (original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/README Sun Aug 27
08:22:03 2006
@@ -13,4 +13,4 @@
You can build the documentation with:
-maven site
+mvn site
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java?rev=437385r1=437384r2=437385view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/SocketClient.java
Sun Aug 27 08:22:03 2006
@@ -263,10 +263,10 @@
*/
public void disconnect() throws IOException
{
-_socket_.close();
-_input_.close();
-_output_.close();
-_socket_ = null;
+if (_socket_ != null) _socket_.close();
+if (_input_ != null) _input_.close();
+if (_output_ != null) _output_.close();
+if (_socket_ != null) _socket_ = null;
_input_ = null;
_output_ = null;
_isConnected_ = false;
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=437385r1=437384r2=437385view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Sun Aug 27 08:22:03 2006
@@ -275,6 +275,7 @@
private long __restartOffset;
private FTPFileEntryParserFactory __parserFactory;
private int __bufferSize;
+private boolean __listHiddenFiles;
// __systemName is a cached value that should not be referenced directly
// except when assigned in getSystemName and __initDefaults.
@@ -302,6 +303,7 @@
__remoteVerificationEnabled = true;
__parserFactory = new DefaultFTPFileEntryParserFactory();
__configuration = null;
+__listHiddenFiles = false;
}
@@ -2390,7 +2392,8 @@
Socket socket;
FTPListParseEngine engine = new FTPListParseEngine(parser);
-if ((socket = _openDataConnection_(FTPCommand.LIST, pathname)) == null)
+
+if ((socket = _openDataConnection_(FTPCommand.LIST,
getListArguments(pathname))) == null)
{
return engine;
}
@@ -2404,7 +2407,20 @@
return engine;
}
-/***
+protected String getListArguments(String pathname) {
+ if (getListHiddenFiles())
+ {
+ StringBuffer sb = new StringBuffer(pathname.length() + 3);
+ sb.append(-a );
+ sb.append(pathname);
+ return sb.toString();
+ }
+
+ return pathname;
+ }
+
+
+ /***
* Issue the FTP STAT command to the server.
* p
* @return The status information returned by the server.
@@ -2488,7 +2504,7 @@
Socket socket;
FTPFile[] results;
-if ((socket = _openDataConnection_(FTPCommand.LIST, pathname)) == null)
+if ((socket = _openDataConnection_(FTPCommand.LIST
svn commit: r437403 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
Author: rwinston
Date: Sun Aug 27 09:44:59 2006
New Revision: 437403
URL: http://svn.apache.org/viewvc?rev=437403view=rev
Log:
Added handler (issue NET-136)
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java?rev=437403view=auto
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
(added)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
Sun Aug 27 09:44:59 2006
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.net.telnet;
+
+/***
+ * Implements the telnet window size option RFC 1073.
+ * p
+ * @author Yuval Kashtan
+ * @version $Id$
+ ***/
+public class WindowSizeOptionHandler extends TelnetOptionHandler
+{
+/***
+ * Horizontal Size
+ ***/
+private int m_nWidth = 80;
+
+/***
+ * Vertical Size
+ ***/
+private int m_nHeight = 24;
+
+/***
+ * Window size option
+ ***/
+protected static final int WINDOW_SIZE = 31;
+
+/***
+ * Constructor for the WindowSizeOptionHandler. Allows defining desired
+ * initial setting for local/remote activation of this option and
+ * behaviour in case a local/remote activation request for this
+ * option is received.
+ * p
+ * @param nWidth - Window width.
+ * @param nHeight - Window Height
+ * @param initlocal - if set to true, a WILL is sent upon connection.
+ * @param initremote - if set to true, a DO is sent upon connection.
+ * @param acceptlocal - if set to true, any DO request is accepted.
+ * @param acceptremote - if set to true, any WILL request is accepted.
+ ***/
+public WindowSizeOptionHandler(
+ int nWidth,
+ int nHeight,
+ boolean initlocal,
+ boolean initremote,
+ boolean acceptlocal,
+ boolean acceptremote
+) {
+super (
+ TelnetOption.WINDOW_SIZE,
+ initlocal,
+ initremote,
+ acceptlocal,
+ acceptremote
+ );
+
+ m_nWidth = nWidth;
+ m_nHeight = nHeight;
+ }
+
+/***
+ * Constructor for the WindowSizeOptionHandler. Initial and accept
+ * behaviour flags are set to false
+ * p
+ * @param nWidth - Window width.
+ * @param nHeight - Window Height
+ ***/
+public WindowSizeOptionHandler(
+ int nWidth,
+ int nHeight
+) {
+super (
+ TelnetOption.WINDOW_SIZE,
+ false,
+ false,
+ false,
+ false
+ );
+
+ m_nWidth = nWidth;
+ m_nHeight = nHeight;
+}
+
+/***
+ * Implements the abstract method of TelnetOptionHandler.
+ * p
+ * @param suboptionData - the sequence received, whithout IAC SB IAC SE
+ * @param suboptionLength - the length of data in suboption_data
+ * p
+ * @return terminal type information
+ ***/
+public int[] answerSubnegotiation(int suboptionData[], int suboptionLength)
+{
+return null;
+}
+
+/***
+ * Implements the abstract method of TelnetOptionHandler.
+ * This will send the client Height and Width to the server.
+ * p
+ * @return always null (no response to subnegotiation)
+ ***/
+public int[] startSubnegotiationLocal()
+{
+ int nCompoundWindowSize = m_nWidth * 0x1 + m_nHeight;
+ int nResponseSize = 5;
+ int nIndex;
+ int nShift;
+ int nTurnedOnBits;
+
+ if ((m_nWidth % 0x100) == 0xFF) {
+ nResponseSize += 1;
+ }
+
+ if ((m_nWidth / 0x100) == 0xFF
svn commit: r437412 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml
Author: rwinston Date: Sun Aug 27 10:11:14 2006 New Revision: 437412 URL: http://svn.apache.org/viewvc?rev=437412view=rev Log: (empty) Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml?rev=437412r1=437411r2=437412view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml Sun Aug 27 10:11:14 2006 @@ -74,6 +74,9 @@ action dev=rwinston type=update Remove reflective check for Socket::isConnected() (no longer needed) /action + action dev=rwinston type=add + Added WindowSizeOptionHandler (NET-136) + /action /release - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r437416 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/build.xml
Author: rwinston Date: Sun Aug 27 10:24:50 2006 New Revision: 437416 URL: http://svn.apache.org/viewvc?rev=437416view=rev Log: Remove build.xml Removed: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/build.xml - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r437098 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
Author: rwinston Date: Fri Aug 25 23:51:56 2006 New Revision: 437098 URL: http://svn.apache.org/viewvc?rev=437098view=rev Log: Cleanup imports Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java?rev=437098r1=437097r2=437098view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java Fri Aug 25 23:51:56 2006 @@ -16,14 +16,14 @@ */ package org.apache.commons.net.ftp; -import junit.framework.TestCase; import java.io.IOException; import java.net.SocketException; -import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Comparator; import java.util.Iterator; import java.util.TreeSet; + +import junit.framework.TestCase; /* * This test was contributed in a different form by W. McDonald Buck - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r437101 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: java/ main/ main/java/
Author: rwinston Date: Fri Aug 25 23:55:02 2006 New Revision: 437101 URL: http://svn.apache.org/viewvc?rev=437101view=rev Log: Move to Maven 2 structure Added: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/ - copied from r437098, jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/ Removed: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r437103 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test: java/ java/org/ org/
Author: rwinston Date: Fri Aug 25 23:58:22 2006 New Revision: 437103 URL: http://svn.apache.org/viewvc?rev=437103view=rev Log: Move to Maven 2 structure Added: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/ - copied from r437098, jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/org/ Removed: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/org/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r437118 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java
Author: rwinston Date: Sat Aug 26 00:50:16 2006 New Revision: 437118 URL: http://svn.apache.org/viewvc?rev=437118view=rev Log: Modified regex Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java?rev=437118r1=437117r2=437118view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java Sat Aug 26 00:50:16 2006 @@ -37,7 +37,7 @@ * this is the regular expression used by this parser. */ private static final String REGEX = -(\\s+|[0-9]+)\\s* +\\s*([0-9]+)\\s* + (\\s+|[A-Z]+)\\s* + (DIR|\\s+)\\s* + (\\S+)\\s+(\\S+)\\s+ /* date stuff */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r437120 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: pom.xml project.xml
Author: rwinston
Date: Sat Aug 26 00:59:03 2006
New Revision: 437120
URL: http://svn.apache.org/viewvc?rev=437120view=rev
Log:
Initial working Maven 2 compile/test cycle
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
Removed:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/project.xml
Added: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?rev=437120view=auto
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (added)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Sat Aug 26
00:59:03 2006
@@ -0,0 +1,209 @@
+?xml version=1.0?
+!--
+Copyright 2003-20066 The Apache Software Foundation
+
+Licensed 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.
+--
+project
+ modelVersion4.0.0/modelVersion
+
+ nameJakarta Commons Net/name
+ groupIdcommons-net/groupId
+artifactIdcommons-net/artifactId
+ version2.0.0-SNAPSHOT/version
+ inceptionYear1997/inceptionYear
+ descriptionJakarta Commons Net/description
+
+
urlhttp://jakarta.apache.org/commons/${pom.artifactId.substring(8)}//url
+
+ organization
+ nameThe Apache Software Foundation/name
+ urlhttp://jakarta.apache.org/url
+ /organization
+
+ licenses
+ license
+ nameThe Apache Software License, Version 2.0/name
+ url/LICENSE.txt/url
+ distributionrepo/distribution
+ /license
+ /licenses
+
+ issueManagement
+ urlhttp://issues.apache.org/jira//url
+ /issueManagement
+
+ distributionManagement
+site
+ idwebsite/id
+ nameApache Website/name
+
urlscp://people.apache.org/www/jakarta.apache.org/commons/proper/net//url
+/site
+ /distributionManagement
+
+ repositories
+ repository
+ idjakarta/id
+
urlhttp://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/url
+ /repository
+ /repositories
+
+ dependencies
+ dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ version3.8.1/version
+ scopetest/scope
+ /dependency
+ /dependencies
+
+ mailingLists
+ mailingList
+ nameCommons Dev List/name
+ subscribe[EMAIL PROTECTED]/subscribe
+ unsubscribe[EMAIL PROTECTED]/unsubscribe
+
archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive
+ /mailingList
+ mailingList
+ nameCommons User List/name
+ subscribe[EMAIL PROTECTED]/subscribe
+ unsubscribe[EMAIL PROTECTED]/unsubscribe
+
archivehttp://mail-archives.apache.org/eyebrowse/[EMAIL PROTECTED]/archive
+ /mailingList
+ /mailingLists
+
+ developers
+ developer
+ nameJeffrey D. Brekke/name
+ idbrekke/id
+ email[EMAIL PROTECTED]/email
+ organizationQuad/Graphics, Inc./organization
+ /developer
+ developer
+ nameSteve Cohen/name
+ idscohen/id
+ email[EMAIL PROTECTED]/email
+ organizationjavactivity.org/organization
+ /developer
+ developer
+ nameBruno D'Avanzo/name
+ idbrudav/id
+ email[EMAIL PROTECTED]/email
+ organizationHewlett-Packard/organization
+ /developer
+ developer
+ nameDaniel F. Savarese/name
+ iddfs/id
+ emaildfs - apache.org/email
+ organization
+ lt;a href=http://www.savarese.com/gt;Savarese
Software Researchlt;/agt;
+ /organization
+ /developer
+ developer
+ nameRory Winston/name
+ idrwinston/id
+ email[EMAIL PROTECTED]/email
+ organization/organization
svn commit: r437131 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java: examples/FTPExample.java examples/ftp.java org/apache/commons/net/ftp/FTPSClient.java
Author: rwinston
Date: Sat Aug 26 02:17:06 2006
New Revision: 437131
URL: http://svn.apache.org/viewvc?rev=437131view=rev
Log: (empty)
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPExample.java
Removed:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/ftp.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPExample.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPExample.java?rev=437131view=auto
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPExample.java
(added)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPExample.java
Sat Aug 26 02:17:06 2006
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2001-2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package examples;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import org.apache.commons.net.ftp.FTP;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPConnectionClosedException;
+import org.apache.commons.net.ftp.FTPReply;
+
+/***
+ * This is an example program demonstrating how to use the FTPClient class.
+ * This program connects to an FTP server and retrieves the specified
+ * file. If the -s flag is used, it stores the local file at the FTP server.
+ * Just so you can see what's happening, all reply strings are printed.
+ * If the -b flag is used, a binary transfer is assumed (default is ASCII).
+ * p
+ * Usage: ftp [-s] [-b] hostname username password remote file local
file
+ * p
+ ***/
+public final class FTPExample
+{
+
+public static final String USAGE =
+Usage: ftp [-s] [-b] hostname username password remote file
local file\n +
+\nDefault behavior is to download a file and use ASCII transfer
mode.\n +
+\t-s store file on server (upload)\n +
+\t-b use binary transfer mode\n;
+
+public static final void main(String[] args)
+{
+int base = 0;
+boolean storeFile = false, binaryTransfer = false, error = false;
+String server, username, password, remote, local;
+FTPClient ftp;
+
+for (base = 0; base args.length; base++)
+{
+if (args[base].startsWith(-s))
+storeFile = true;
+else if (args[base].startsWith(-b))
+binaryTransfer = true;
+else
+break;
+}
+
+if ((args.length - base) != 5)
+{
+System.err.println(USAGE);
+System.exit(1);
+}
+
+server = args[base++];
+username = args[base++];
+password = args[base++];
+remote = args[base++];
+local = args[base];
+
+ftp = new FTPClient();
+ftp.addProtocolCommandListener(new PrintCommandListener(
+ new PrintWriter(System.out)));
+
+try
+{
+int reply;
+ftp.connect(server);
+System.out.println(Connected to + server + .);
+
+// After connection attempt, you should check the reply code to
verify
+// success.
+reply = ftp.getReplyCode();
+
+if (!FTPReply.isPositiveCompletion(reply))
+{
+ftp.disconnect();
+System.err.println(FTP server refused connection.);
+System.exit(1);
+}
+}
+catch (IOException e)
+{
+if (ftp.isConnected())
+{
+try
+{
+ftp.disconnect();
+}
+catch (IOException f)
+{
+// do nothing
+}
+}
+System.err.println(Could not connect to server.);
+e.printStackTrace();
+System.exit(1);
+}
+
+__main:
+try
+{
+if (!ftp.login(username, password))
+{
+ftp.logout
svn commit: r437132 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java: examples/FTPSExample.java org/apache/commons/net/ftp/FTPSClient.java
Author: rwinston
Date: Sat Aug 26 02:24:11 2006
New Revision: 437132
URL: http://svn.apache.org/viewvc?rev=437132view=rev
Log:
Added FTPS example from José's submission and added default ctor to
FTPSClient.java. Also cleaned up some Javadoc.
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java?rev=437132view=auto
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
(added)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
Sat Aug 26 02:24:11 2006
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2001-2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package examples;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import org.apache.commons.net.ftp.FTP;
+import org.apache.commons.net.ftp.FTPConnectionClosedException;
+import org.apache.commons.net.ftp.FTPReply;
+import org.apache.commons.net.ftp.FTPSClient;
+
+/***
+ * This is an example program demonstrating how to use the FTPSClient class.
+ * This program connects to an FTP server and retrieves the specified
+ * file. If the -s flag is used, it stores the local file at the FTP server.
+ * Just so you can see what's happening, all reply strings are printed.
+ * If the -b flag is used, a binary transfer is assumed (default is ASCII).
+ * p
+ * Usage: ftp [-s] [-b] hostname username password remote file local
file
+ * p
+ ***/
+public final class FTPSExample
+{
+
+public static final String USAGE =
+Usage: ftp [-s] [-b] hostname username password remote file
local file\n +
+\nDefault behavior is to download a file and use ASCII transfer
mode.\n +
+\t-s store file on server (upload)\n +
+\t-b use binary transfer mode\n;
+
+public static final void main(String[] args)
+{
+ int base = 0;
+boolean storeFile = false, binaryTransfer = false, error = false;
+String server, username, password, remote, local;
+FTPSClient ftps;
+
+for (base = 0; base args.length; base++)
+{
+if (args[base].startsWith(-s))
+storeFile = true;
+else if (args[base].startsWith(-b))
+binaryTransfer = true;
+else
+break;
+}
+
+if ((args.length - base) != 5)
+{
+System.err.println(USAGE);
+System.exit(1);
+}
+
+server = args[base++];
+username = args[base++];
+password = args[base++];
+remote = args[base++];
+local = args[base];
+
+ftps = new FTPSClient(JKS,SSL,password,0,P);
+// NOTE this is necessary for FTPSClient connections
+ ftps.setReaderThread(false);
+ftps.addProtocolCommandListener(new PrintCommandListener(new
PrintWriter(System.out)));
+
+try
+{
+int reply;
+
+ftps.connect(server);
+System.out.println(Connected to + server + .);
+
+// After connection attempt, you should check the reply code to
verify
+// success.
+reply = ftps.getReplyCode();
+
+if (!FTPReply.isPositiveCompletion(reply))
+{
+ftps.disconnect();
+System.err.println(FTP server refused connection.);
+System.exit(1);
+}
+}
+catch (IOException e)
+{
+if (ftps.isConnected())
+{
+try
+{
+ftps.disconnect();
+}
+catch (IOException f)
+{
+// do nothing
+}
+}
+System.err.println(Could not connect to server.);
+e.printStackTrace();
+System.exit(1);
+}
+
+__main
svn commit: r437134 [2/2] - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: main/java/examples/ main/java/examples/nntp/ main/java/examples/ntp/ main/java/org/apache/commons/net/ main/java
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java?rev=437134r1=437133r2=437134view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java Sat Aug 26 02:36:36 2006 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005 The Apache Software Foundation + * Copyright 2001-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java?rev=437134r1=437133r2=437134view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java Sat Aug 26 02:36:36 2006 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005 The Apache Software Foundation + * Copyright 2001-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/Util.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/Util.java?rev=437134r1=437133r2=437134view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/Util.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/Util.java Sat Aug 26 02:36:36 2006 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005 The Apache Software Foundation + * Copyright 2001-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/ArticlePointer.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/ArticlePointer.java?rev=437134r1=437133r2=437134view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/ArticlePointer.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/ArticlePointer.java Sat Aug 26 02:36:36 2006 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005 The Apache Software Foundation + * Copyright 2001-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTP.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTP.java?rev=437134r1=437133r2=437134view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTP.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTP.java Sat Aug 26 02:36:36 2006 @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005 The Apache Software Foundation + * Copyright 2001-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java?rev=437134r1=437133r2=437134view=diff
svn commit: r437149 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
Author: rwinston
Date: Sat Aug 26 04:56:49 2006
New Revision: 437149
URL: http://svn.apache.org/viewvc?rev=437149view=rev
Log: (empty)
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java?rev=437149r1=437148r2=437149view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
Sat Aug 26 04:56:49 2006
@@ -15,6 +15,7 @@
*/
package org.apache.commons.net.ftp.parser;
+
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -22,9 +23,6 @@
import org.apache.commons.net.ftp.FTPFileEntryParserImpl;
-
-
-
/**
* This abstract class implements both the older FTPFileListParser and
* newer FTPFileEntryParser interfaces with default functionality.
@@ -34,128 +32,121 @@
*
* @author Steve Cohen [EMAIL PROTECTED]
*/
-public abstract class RegexFTPFileEntryParserImpl extends
FTPFileEntryParserImpl
-{
-/**
- * internal pattern the matcher tries to match, representing a file
- * entry
- */
-private Pattern pattern = null;
-
-/**
- * internal match result used by the parser
- */
-private MatchResult result = null;
-
-/**
- * Internal PatternMatcher object used by the parser. It has protected
- * scope in case subclasses want to make use of it for their own purposes.
- */
-protected Matcher _matcher_ = null;
-
-/**
- * The constructor for a RegexFTPFileEntryParserImpl object.
- *
- * @param regex The regular expression with which this object is
- * initialized.
- *
- * @exception IllegalArgumentException
- * Thrown if the regular expression is unparseable. Should not be seen in
- * normal conditions. It it is seen, this is a sign that a subclass has
- * been created with a bad regular expression. Since the parser must be
- * created before use, this means that any bad parser subclasses created
- * from this will bomb very quickly, leading to easy detection.
- */
-
-public RegexFTPFileEntryParserImpl(String regex)
-{
-super();
-try
-{
-//matcher_ = new Perl5Matcher();
-pattern = Pattern.compile(regex);
-}
-catch (PatternSyntaxException e)
-{
-throw new IllegalArgumentException (
- Unparseable regex supplied: + regex);
-}
-}
-
-/**
- * Convenience method delegates to the internal MatchResult's matches()
- * method.
- *
- * @param s the String to be matched
- * @return true if s matches this object's regular expression.
- */
-
-public boolean matches(String s)
-{
-this.result = null;
-_matcher_ = pattern.matcher(s);
-if (_matcher_.matches())
-{
-this.result = _matcher_.toMatchResult();
-}
-return null != this.result;
-}
-
-
-/**
- * Convenience method
- *
- * @return the number of groups() in the internal MatchResult.
- */
-
-public int getGroupCnt()
-{
-if (this.result == null)
-{
-return 0;
-}
-return this.result.groupCount();
-}
-
-
-
-/**
- * Convenience method delegates to the internal MatchResult's group()
- * method.
- *
- * @param matchnum match group number to be retrieved
- *
- * @return the content of the codematchnum'thcode group of the internal
- * match or null if this method is called without a match having
- * been made.
- */
-public String group(int matchnum)
-{
-if (this.result == null)
-{
-return null;
-}
-return this.result.group(matchnum);
-}
-
-/**
- * For debugging purposes - returns a string shows each match group by
- * number.
- *
- * @return a string shows each match group by number.
- */
-
-public String getGroupsAsString()
-{
-StringBuffer b = new StringBuffer();
-for (int i = 1; i = this.result.groupCount(); i++)
-{
-b.append(i).append() ).append(this.result.group(i))
-.append(System.getProperty(line.separator));
-}
-return b.toString();
-}
-
-}
-
+public abstract class
svn commit: r437150 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
Author: rwinston Date: Sat Aug 26 04:58:03 2006 New Revision: 437150 URL: http://svn.apache.org/viewvc?rev=437150view=rev Log: Update copyright dates Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java?rev=437150r1=437149r2=437150view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java Sat Aug 26 04:58:03 2006 @@ -1,5 +1,5 @@ /* - * Copyright 2005 The Apache Software Foundation + * Copyright 2001-2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the License); * you may not use this file except in compliance with the License. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r437151 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp: FTPSClient.java FTPSCommand.java FTPSReply.java FTPSSocketFactory.java
Author: rwinston
Date: Sat Aug 26 05:09:50 2006
New Revision: 437151
URL: http://svn.apache.org/viewvc?rev=437151view=rev
Log:
Added FTPS impl based on submission inb
https://issues.apache.org/jira/browse/NET-28
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSCommand.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=437151r1=437150r2=437151view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Sat Aug 26 05:09:50 2006
@@ -1,12 +1,11 @@
-/*
- * Copyright 2001-2006 The Apache Software Foundation
- *
+/**
+ *
* Licensed 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
- *
+ *
+ * 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.
@@ -23,160 +22,629 @@
import java.net.InetAddress;
import java.net.Socket;
import java.net.SocketException;
+import java.security.KeyManagementException;
import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.util.Enumeration;
+import java.util.Vector;
+import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
-
+import javax.net.ssl.TrustManagerFactory;
/**
- *
- * This class extends [EMAIL PROTECTED] org.apache.commons.net.ftp.FTPClient}
to add
- * the necessary methods that implement SSL/TLS-FTPS.
- *
+ * FTP over SSL processing.
*/
public class FTPSClient extends FTPClient {
- // Represent the method to the FTP command AUTH...
- private String sslContext;
-
- // Secure context (can be TLS or SSL)
- private SSLContext context;
-
- private String pbsz;
- private String prot;
-
- /**
-* Default constructor that selects some default options (TLS
encryption)
-*
-*/
- public FTPSClient() {
- this(JCEKS, TLS, password, 0, P);
- }
-
-
- /**
-*
-* Constructor that initializes the secure connection.
-*
-* @param keyStoreName Type of instance KeyStore, JKS for Java 1.3 y
JCEKS for Java 1.4
-* @param sslContext Type of the instance SSLContext, can be SSL or TLS.
-* @param password The password to access the KeyStore.
-* @param pbsz Protection buffer size (Use 0 to indicate streaming)
-* @param prot The protection level for the data channel
-*/
- public FTPSClient(String keyStoreName, String sslContext, String
password, String pbsz, String prot) {
- this.sslContext = sslContext;
- this.pbsz = pbsz;
- this.prot = prot;
-
- try {
- KeyStore keyStore = KeyStore.getInstance(keyStoreName);
-
- keyStore.load(null, password.toCharArray());
-
- KeyManagerFactory keyManagerFactory =
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-
- keyManagerFactory.init(keyStore,
password.toCharArray());
-
- this.context = SSLContext.getInstance(sslContext);
-
- this.context.init(
- keyManagerFactory.getKeyManagers(),
- new TrustManager[] { (TrustManager) new
FTPSTrustManager() }, null
- );
- } catch (Exception e
svn commit: r437155 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net: ftp/FTPSClient.java ntp/NtpV3Impl.java
Author: rwinston
Date: Sat Aug 26 05:24:34 2006
New Revision: 437155
URL: http://svn.apache.org/viewvc?rev=437155view=rev
Log:
* Changed double-check lock var to be volatile (works under Tiger)
* Added FTPSClient example
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=437155r1=437154r2=437155view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Sat Aug 26 05:24:34 2006
@@ -43,6 +43,23 @@
/**
* FTP over SSL processing.
+ *
+ * pFor example:
+ * p
+ * code
+ * FTPSClient client = new FTPSClient();
+ * client.setReaderThread(false);
+ * client.addProtocolCommandListener(new PrintCommandListener(new
PrintWriter(System.out)));
+ * client.connect(127.0.0.1);
+ * client.login(username, password);
+ *
+ * for (FTPFile file : client.listFiles()) {
+ * System.out.printf(%s [%d bytes]\n, file.getName(),
file.getSize());
+ * }
+ *
+ * client.disconnect();
+ * /code
+ * /p
*/
public class FTPSClient extends FTPClient {
@@ -405,9 +422,9 @@
socket.startHandshake();
_socket_ = socket;
-_controlInput = new BufferedReader(new InputStreamReader(
+_controlInput_ = new BufferedReader(new InputStreamReader(
socket .getInputStream(), getControlEncoding()));
-_controlOutput = new BufferedWriter(new OutputStreamWriter(
+_controlOutput_ = new BufferedWriter(new OutputStreamWriter(
socket.getOutputStream(), getControlEncoding()));
}
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java?rev=437155r1=437154r2=437155view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
Sat Aug 26 05:24:34 2006
@@ -55,7 +55,7 @@
private byte[] buf = new byte[48];
-private DatagramPacket dp;
+private volatile DatagramPacket dp;
/** Creates a new instance of NtpV3Impl */
public NtpV3Impl()
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r437157 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src: main/java/examples/ main/java/org/apache/commons/net/io/ main/java/org/apache/commons/net/nntp/ main/java/org/apache/c
Author: rwinston
Date: Sat Aug 26 05:35:44 2006
New Revision: 437157
URL: http://svn.apache.org/viewvc?rev=437157view=rev
Log:
Cleaned up some minor stuff (thanks FindBugs)
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/ftp/parser/FTPConfigEntryParserTest.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/test/java/org/apache/commons/net/telnet/InvalidTelnetOptionExceptionTest.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java?rev=437157r1=437156r2=437157view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/FTPSExample.java
Sat Aug 26 05:35:44 2006
@@ -21,6 +21,8 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.security.NoSuchAlgorithmException;
+
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPConnectionClosedException;
import org.apache.commons.net.ftp.FTPReply;
@@ -45,7 +47,7 @@
\t-s store file on server (upload)\n +
\t-b use binary transfer mode\n;
-public static final void main(String[] args)
+public static final void main(String[] args) throws
NoSuchAlgorithmException
{
int base = 0;
boolean storeFile = false, binaryTransfer = false, error = false;
@@ -74,7 +76,7 @@
remote = args[base++];
local = args[base];
-ftps = new FTPSClient(JKS,SSL,password,0,P);
+ftps = new FTPSClient();
// NOTE this is necessary for FTPSClient connections
ftps.setReaderThread(false);
ftps.addProtocolCommandListener(new PrintCommandListener(new
PrintWriter(System.out)));
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java?rev=437157r1=437156r2=437157view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
Sat Aug 26 05:35:44 2006
@@ -15,7 +15,6 @@
*/
package org.apache.commons.net.io;
-import java.util.Enumeration;
import java.util.EventListener;
import org.apache.commons.net.util.ListenerList;
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java?rev=437157r1=437156r2=437157view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
Sat Aug 26 05:35:44 2006
@@ -1215,8 +1215,8 @@
throws IOException
{
return
-__retrieveArticleInfo(new String(lowArticleNumber + - +
- highArticleNumber));
+__retrieveArticleInfo(lowArticleNumber + - +
+ highArticleNumber);
}
/***
@@ -1269,9 +1269,7 @@
throws IOException
{
return
-__retrieveHeader(header,
- new String(lowArticleNumber + - +
-highArticleNumber));
+__retrieveHeader(header,lowArticleNumber + - +
highArticleNumber);
}
}
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java
svn commit: r437191 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: pom.xml xdocs/changes.xml
Author: rwinston
Date: Sat Aug 26 10:49:37 2006
New Revision: 437191
URL: http://svn.apache.org/viewvc?rev=437191view=rev
Log:
This may clear the way for a 2.0 new release and a 1.5 maintenance release
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml?rev=437191r1=437190r2=437191view=diff
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml (original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/pom.xml Sat Aug 26
10:49:37 2006
@@ -1,6 +1,6 @@
?xml version=1.0?
!--
-Copyright 2003-20066 The Apache Software Foundation
+Copyright 2003-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the License);
you may not use this file except in compliance with the License.
@@ -23,7 +23,14 @@
version2.0.0-SNAPSHOT/version
inceptionYear1997/inceptionYear
descriptionJakarta Commons Net/description
-
+
+ pluginRepositories
+pluginRepository
+ idsnapshots/id
+ urlhttp://people.apache.org/maven-snapshot-repository//url
+/pluginRepository
+ /pluginRepositories
+
urlhttp://jakarta.apache.org/commons/${pom.artifactId.substring(8)}//url
organization
@@ -40,7 +47,7 @@
/licenses
issueManagement
- urlhttp://issues.apache.org/jira//url
+ urlhttps://issues.apache.org/jira/browse/NET/url
/issueManagement
distributionManagement
@@ -144,7 +151,7 @@
scm
connectionscm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/connection
developerConnectionscm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/developerConnection
-
urlhttp://svn.apache.org/repos/asf/jakarta/commons/proper/net/trunk/url
+ urlhttp://svn.apache.org/viewvc/jakarta/commons/proper/net/trunk/url
/scm
build
@@ -193,17 +200,25 @@
/testResources
/build
-
- reports
- reportmaven-changes-plugin/report
- reportmaven-tasklist-plugin/report
- reportmaven-junit-report-plugin/report
- reportmaven-jdepend-plugin/report
- reportmaven-jcoverage-plugin/report
- reportmaven-simian-plugin/report
- reportmaven-javadoc-plugin/report
- reportmaven-jxr-plugin/report
- reportmaven-license-plugin/report
- /reports
+
+reporting
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-changes-plugin/artifactId
+configuration
+ xmlPath${basedir}/xdocs/changes.xml/xmlPath
+/configuration
+reportSets
+ reportSet
+reports
+ reportchanges-report/report
+ reportjira-report/report
+/reports
+ /reportSet
+/reportSets
+ /plugin
+/plugins
+ /reporting
/project
Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml?rev=437191r1=437190r2=437191view=diff
==
--- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml
(original)
+++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml Sat
Aug 26 10:49:37 2006
@@ -22,6 +22,43 @@
body
+ release version=2.0 date= description=Java 5.0+ release
+ action dev=rwinston type=add
+ FTPS (TLS and SSL) is now supported. Thanks to
Jose Juan Montiel, Paul Ferraro, and Satoshi Ishigami.
+ /action
+ action dev=rwinston type=update
+ Commons::Net now uses Maven 2.
+ /action
+ action dev=rwinston type=remove
+ Removed old ftp2 proposal directories.
+ /action
+ action dev=rwinston type=update
+ Commons::Net now uses JDK regex functionality,
saving on an extra [oro] dependency.
+ /action
+ action dev=rwinston type=fix
+ Various syntactic issues (FindBugs issues, JDK
5.0 generics support)
+ /action
+ action dev=dfs type=fix
+ Applied Rob Hasselbaum's
+ lt;rhasselbaum - alumni.ithaca.edugt
svn commit: r436937 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/
Author: rwinston Date: Fri Aug 25 13:47:57 2006 New Revision: 436937 URL: http://svn.apache.org/viewvc?rev=436937view=rev Log: Create a JDK 5.0 (Tiger) branch. Added: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/ - copied from r436936, jakarta/commons/proper/net/trunk/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r436939 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/project.xml
Author: rwinston Date: Fri Aug 25 13:50:08 2006 New Revision: 436939 URL: http://svn.apache.org/viewvc?rev=436939view=rev Log: Update date Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/project.xml Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/project.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/project.xml?rev=436939r1=436938r2=436939view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/project.xml (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/project.xml Fri Aug 25 13:50:08 2006 @@ -1,6 +1,6 @@ ?xml version=1.0? !-- -Copyright 2003-2005 The Apache Software Foundation +Copyright 2003-20066 The Apache Software Foundation Licensed under the Apache License, Version 2.0 (the License); you may not use this file except in compliance with the License. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r436942 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/proposal/
Author: rwinston Date: Fri Aug 25 13:54:05 2006 New Revision: 436942 URL: http://svn.apache.org/viewvc?rev=436942view=rev Log: Remove these for now Removed: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/proposal/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r436947 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/parser: RegexFTPFileEntryParserImpl.java VMSVersioningFTPEntryParser.java
Author: rwinston
Date: Fri Aug 25 14:03:10 2006
New Revision: 436947
URL: http://svn.apache.org/viewvc?rev=436947view=rev
Log:
Use JDK 5 regex facilities (including MatchResult)
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java?rev=436947r1=436946r2=436947view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
Fri Aug 25 14:03:10 2006
@@ -15,13 +15,13 @@
*/
package org.apache.commons.net.ftp.parser;
+import java.util.regex.MatchResult;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
import org.apache.commons.net.ftp.FTPFileEntryParserImpl;
-import org.apache.oro.text.regex.MalformedPatternException;
-import org.apache.oro.text.regex.MatchResult;
-import org.apache.oro.text.regex.Pattern;
-import org.apache.oro.text.regex.PatternMatcher;
-import org.apache.oro.text.regex.Perl5Compiler;
-import org.apache.oro.text.regex.Perl5Matcher;
+
@@ -51,7 +51,7 @@
* Internal PatternMatcher object used by the parser. It has protected
* scope in case subclasses want to make use of it for their own purposes.
*/
-protected PatternMatcher _matcher_ = null;
+protected Matcher _matcher_ = null;
/**
* The constructor for a RegexFTPFileEntryParserImpl object.
@@ -72,10 +72,10 @@
super();
try
{
-_matcher_ = new Perl5Matcher();
-pattern = new Perl5Compiler().compile(regex);
+//matcher_ = new Perl5Matcher();
+pattern = Pattern.compile(regex);
}
-catch (MalformedPatternException e)
+catch (PatternSyntaxException e)
{
throw new IllegalArgumentException (
Unparseable regex supplied: + regex);
@@ -93,18 +93,17 @@
public boolean matches(String s)
{
this.result = null;
-if (_matcher_.matches(s.trim(), this.pattern))
+_matcher_ = pattern.matcher(s);
+if (_matcher_.matches())
{
-this.result = _matcher_.getMatch();
+this.result = _matcher_.toMatchResult();
}
return null != this.result;
}
-
-
+
/**
- * Convenience method delegates to the internal MatchResult's groups()
- * method.
+ * Convenience method
*
* @return the number of groups() in the internal MatchResult.
*/
@@ -115,7 +114,7 @@
{
return 0;
}
-return this.result.groups();
+return this.result.groupCount();
}
@@ -149,7 +148,7 @@
public String getGroupsAsString()
{
StringBuffer b = new StringBuffer();
-for (int i = 1; i = this.result.groups(); i++)
+for (int i = 1; i = this.result.groupCount(); i++)
{
b.append(i).append() ).append(this.result.group(i))
.append(System.getProperty(line.separator));
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java?rev=436947r1=436946r2=436947view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
Fri Aug 25 14:03:10 2006
@@ -18,13 +18,12 @@
import java.util.HashMap;
import java.util.List;
import java.util.ListIterator;
+import java.util.regex.MatchResult;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
import org.apache.commons.net.ftp.FTPClientConfig;
-import org.apache.oro.text.regex.MalformedPatternException;
-import org.apache.oro.text.regex.MatchResult;
-import org.apache.oro.text.regex.Pattern;
-import org.apache.oro.text.regex.Perl5Compiler;
-import
svn commit: r436949 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp: FTPSClient.java FTPSSocketFactory.java FTPSTrustManager.java
Author: rwinston
Date: Fri Aug 25 14:05:56 2006
New Revision: 436949
URL: http://svn.apache.org/viewvc?rev=436949view=rev
Log:
Add initial FTPS classes
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTPSClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTPSTrustManager.java
Added:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTPSClient.java?rev=436949view=auto
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTPSClient.java
(added)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTPSClient.java
Fri Aug 25 14:05:56 2006
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2001-2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.net.ftp;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.security.KeyStore;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.TrustManager;
+
+public class FTPSClient extends FTPClient
+{
+ private static final String PASSWORD = password;
+
+ private SSLContext context;
+
+ public FTPSClient()
+ {
+ try
+ {
+ KeyStore keyStore = KeyStore.getInstance(JCEKS);
+ keyStore.load(null, PASSWORD.toCharArray());
+
+ KeyManagerFactory keyManagerFactory =
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+ keyManagerFactory.init(keyStore,
PASSWORD.toCharArray());
+
+ this.context = SSLContext.getInstance(TLS);
+ this.context.init(keyManagerFactory.getKeyManagers(),
new TrustManager[] { new FTPSTrustManager() }, null);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+* @see
org.apache.commons.net.SocketClient#connect(java.net.InetAddress, int,
java.net.InetAddress, int)
+*/
+ public void connect(InetAddress address, int port, InetAddress
localAddress, int localPort) throws SocketException, IOException
+ {
+ super.connect(address, port, localAddress, localPort);
+
+ this.secure();
+ }
+
+ /**
+* @see
org.apache.commons.net.SocketClient#connect(java.net.InetAddress, int)
+*/
+ public void connect(InetAddress address, int port) throws
SocketException, IOException
+ {
+ super.connect(address, port);
+
+ this.secure();
+ }
+
+ /**
+* @see org.apache.commons.net.SocketClient#connect(java.lang.String,
int, java.net.InetAddress, int)
+*/
+ public void connect(String address, int port, InetAddress localAddress,
int localPort) throws SocketException, IOException
+ {
+ super.connect(address, port, localAddress, localPort);
+
+ this.secure();
+ }
+
+ /**
+* @see org.apache.commons.net.SocketClient#connect(java.lang.String,
int)
+*/
+ public void connect(String address, int port) throws SocketException,
IOException
+ {
+ super.connect(address, port);
+
+ this.secure();
+ }
+
+ public void secure() throws IOException
+ {
+ this.sendCommand(AUTH, TLS);
+
+ SSLSocket socket = (SSLSocket)
this.context.getSocketFactory().createSocket(this._socket_,
this.getRemoteAddress().getHostAddress(), this.getRemotePort(), true);
+
+ socket.startHandshake
svn commit: r436950 - /jakarta/commons/proper/net/branches/JDK_1_4_BRANCH/
Author: rwinston Date: Fri Aug 25 14:06:59 2006 New Revision: 436950 URL: http://svn.apache.org/viewvc?rev=436950view=rev Log: Cleanup Removed: jakarta/commons/proper/net/branches/JDK_1_4_BRANCH/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r436960 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTP.java
Author: rwinston
Date: Fri Aug 25 14:27:28 2006
New Revision: 436960
URL: http://svn.apache.org/viewvc?rev=436960view=rev
Log:
Explicitly use isConnected() without reflection
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTP.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTP.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTP.java?rev=436960r1=436959r2=436960view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTP.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ftp/FTP.java
Fri Aug 25 14:27:28 2006
@@ -19,8 +19,6 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.Socket;
import java.net.SocketException;
@@ -482,11 +480,10 @@
}
/**
- * Checks if the socket is connected using reflection to be backward
compatible.
- * The return value of this method is only meaningful in an java 1.4
environment.
+ * Checks if the socket is connected
*
* @param socket
- * @return true if connected or pre java 1.4
+ * @return true if connected
*/
private boolean socketIsConnected(Socket socket)
{
@@ -495,23 +492,8 @@
return false;
}
-try
-{
-Method isConnected = socket.getClass().getMethod(isConnected,
null);
-return ((Boolean) isConnected.invoke(socket, null)).booleanValue();
-}
-catch (NoSuchMethodException e)
-{
-return true;
-}
-catch (IllegalAccessException e)
-{
-return true;
-}
-catch (InvocationTargetException e)
-{
-return true;
-}
+return socket.isConnected();
+
}
/***
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r436969 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net: ./ bsd/ io/ nntp/ ntp/ pop3/ smtp/ telnet/ tftp/ util/
Author: rwinston
Date: Fri Aug 25 14:51:30 2006
New Revision: 436969
URL: http://svn.apache.org/viewvc?rev=436969view=rev
Log:
* Import cleanup
* Use CopyOnWriteArrayList to store listener list
* Make ListenerList.java implement IterableEventListener
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/FingerClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ProtocolCommandSupport.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/TimeTCPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/bsd/RExecClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/io/CopyStreamAdapter.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/nntp/NNTP.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/nntp/NNTPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ntp/NTPUDPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ntp/TimeInfo.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ntp/TimeStamp.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/pop3/POP3.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/pop3/POP3Client.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/smtp/SMTP.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/smtp/SMTPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/telnet/Telnet.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/telnet/TelnetClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/telnet/TelnetInputStream.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/tftp/TFTP.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/tftp/TFTPClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/util/ListenerList.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/FingerClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/FingerClient.java?rev=436969r1=436968r2=436969view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/FingerClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/FingerClient.java
Fri Aug 25 14:51:30 2006
@@ -15,12 +15,12 @@
*/
package org.apache.commons.net;
+import java.io.BufferedOutputStream;
import java.io.BufferedReader;
+import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.BufferedOutputStream;
-import java.io.DataOutputStream;
/***
* The FingerClient class implements the client side of the Internet Finger
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ProtocolCommandSupport.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ProtocolCommandSupport.java?rev=436969r1=436968r2=436969view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ProtocolCommandSupport.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ProtocolCommandSupport.java
Fri Aug 25 14:51:30 2006
@@ -17,6 +17,8 @@
import java.io.Serializable;
import java.util.Enumeration;
+import java.util.EventListener;
+
import org.apache.commons.net.util.ListenerList;
/***
@@ -62,18 +64,13 @@
***/
public void fireCommandSent(String command, String message)
{
-Enumeration en;
ProtocolCommandEvent event;
-ProtocolCommandListener listener;
-
-en = __listeners.getListeners();
event = new ProtocolCommandEvent(__source, command, message);
-while (en.hasMoreElements())
+for (EventListener listener : __listeners)
{
-listener = (ProtocolCommandListener)en.nextElement();
-listener.protocolCommandSent(event);
+ ((ProtocolCommandListener)listener).protocolCommandSent(event);
}
}
@@ -92,18 +89,12 @@
***/
public void
svn commit: r436970 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ProtocolCommandSupport.java
Author: rwinston Date: Fri Aug 25 14:51:55 2006 New Revision: 436970 URL: http://svn.apache.org/viewvc?rev=436970view=rev Log: * Import cleanup * Use CopyOnWriteArrayList to store listener list * Make ListenerList.java implement IterableEventListener Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ProtocolCommandSupport.java Modified: jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ProtocolCommandSupport.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ProtocolCommandSupport.java?rev=436970r1=436969r2=436970view=diff == --- jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ProtocolCommandSupport.java (original) +++ jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/ProtocolCommandSupport.java Fri Aug 25 14:51:55 2006 @@ -16,7 +16,6 @@ package org.apache.commons.net; import java.io.Serializable; -import java.util.Enumeration; import java.util.EventListener; import org.apache.commons.net.util.ListenerList; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r436972 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/util/ListenerList.java
Author: rwinston
Date: Fri Aug 25 14:54:11 2006
New Revision: 436972
URL: http://svn.apache.org/viewvc?rev=436972view=rev
Log:
Synchronized keyword redundant, since we are using a thread-safe collection
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/util/ListenerList.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/util/ListenerList.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/util/ListenerList.java?rev=436972r1=436971r2=436972view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/util/ListenerList.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/java/org/apache/commons/net/util/ListenerList.java
Fri Aug 25 14:54:11 2006
@@ -35,12 +35,12 @@
__listeners = new CopyOnWriteArrayListEventListener();
}
-public synchronized void addListener(EventListener listener)
+public void addListener(EventListener listener)
{
__listeners.add(listener);
}
-public synchronized void removeListener(EventListener listener)
+public void removeListener(EventListener listener)
{
__listeners.remove(listener);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
