Author: rwinston
Date: Mon Aug 28 10:47:02 2006
New Revision: 437767
URL: http://svn.apache.org/viewvc?rev=437767&view=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=437767&r1=437766&r2=437767&view=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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*FunctionalTest.java</exclude>
- <exclude>**/TestSetupParameters.java</exclude>
- <exclude>**/*POP3*.java</exclude>
- </excludes>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*FunctionalTest.java</exclude>
+
<exclude>**/TestSetupParameters.java</exclude>
+ <exclude>**/*POP3*.java</exclude>
+ </excludes>
+ </configuration>
</plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</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>
+ <goal>run</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=437767&r1=437766&r2=437767&view=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=437767&r1=437766&r2=437767&view=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
Mon Aug 28 10:47:02 2006
@@ -23,6 +23,7 @@
import java.io.PrintWriter;
import java.security.NoSuchAlgorithmException;
+import org.apache.commons.net.PrintCommandListener;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPConnectionClosedException;
import org.apache.commons.net.ftp.FTPReply;
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/mail.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/mail.java?rev=437767&r1=437766&r2=437767&view=diff
==============================================================================
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/mail.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/mail.java
Mon Aug 28 10:47:02 2006
@@ -24,6 +24,8 @@
import java.io.Writer;
import java.util.Enumeration;
import java.util.Vector;
+
+import org.apache.commons.net.PrintCommandListener;
import org.apache.commons.net.io.Util;
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
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?rev=437767&r1=437766&r2=437767&view=diff
==============================================================================
---
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
Mon Aug 28 10:47:02 2006
@@ -18,11 +18,11 @@
import java.io.IOException;
import java.io.PrintWriter;
+import org.apache.commons.net.PrintCommandListener;
import org.apache.commons.net.nntp.Article;
import org.apache.commons.net.nntp.NNTPClient;
import org.apache.commons.net.nntp.NewsgroupInfo;
-import examples.PrintCommandListener;
/**
* Simple class showing some of the extended commands (AUTH, XOVER, LIST
ACTIVE)
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?rev=437767&r1=437766&r2=437767&view=diff
==============================================================================
---
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
Mon Aug 28 10:47:02 2006
@@ -20,12 +20,12 @@
import java.io.PrintWriter;
import java.net.SocketException;
+import org.apache.commons.net.PrintCommandListener;
import org.apache.commons.net.nntp.Article;
import org.apache.commons.net.nntp.NNTPClient;
import org.apache.commons.net.nntp.NewsgroupInfo;
import org.apache.commons.net.nntp.Threader;
-import examples.PrintCommandListener;
public class MessageThreading {
public MessageThreading() {
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/post.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/post.java?rev=437767&r1=437766&r2=437767&view=diff
==============================================================================
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/post.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/nntp/post.java
Mon Aug 28 10:47:02 2006
@@ -22,12 +22,13 @@
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.Writer;
+
+import org.apache.commons.net.PrintCommandListener;
import org.apache.commons.net.io.Util;
import org.apache.commons.net.nntp.NNTPClient;
import org.apache.commons.net.nntp.NNTPReply;
import org.apache.commons.net.nntp.SimpleNNTPHeader;
-import examples.PrintCommandListener;
/***
* This is an example program using the NNTP package to post an article
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/server2serverFTP.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/server2serverFTP.java?rev=437767&r1=437766&r2=437767&view=diff
==============================================================================
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/server2serverFTP.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/examples/server2serverFTP.java
Mon Aug 28 10:47:02 2006
@@ -18,6 +18,8 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.net.InetAddress;
+
+import org.apache.commons.net.PrintCommandListener;
import org.apache.commons.net.ProtocolCommandListener;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPReply;
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=437767&r1=437766&r2=437767&view=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
Mon Aug 28 10:47:02 2006
@@ -43,22 +43,6 @@
/**
* FTP over SSL processing.
- *
- * <p>For example:
- * <p>
- * <code>
- * FTPSClient client = new FTPSClient();
- * 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 {
@@ -402,6 +386,13 @@
private void sslNegotiation() throws IOException {
// Evacuation not ssl socket.
planeSocket = _socket_;
+
+ try {
+ context.init(null, new TrustManager[] { new
FTPSTrustManager() } , null);
+ } catch (KeyManagementException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
SSLSocketFactory ssf = context.getSocketFactory();
String ip = _socket_.getInetAddress().getHostAddress();
@@ -640,8 +631,7 @@
* Null is returned if an FTP protocol error is reported at any point
* during the establishment and initialization of the connection.
* @throws IOException If there is any problem with the connection.
- * @see org.apache.commons.net.ftp.FTPCliente
- * #_openDataConnection_(java.lang.String, int)
+ * @see
org.apache.commons.net.ftp.FTPClient#_openDataConnection_(java.lang.String, int)
*/
protected Socket _openDataConnection_(int command, String arg)
throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
