diff --git a/..gitignore.un~ b/..gitignore.un~ new file mode 100644 index 00000000..182147a3 Binary files /dev/null and b/..gitignore.un~ differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..52638dc8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +/bin/ +/target/ +/**/target/ +.classpath +.project +.settings/ +/**/.classpath +/**/.project +/**/.settings/ diff --git a/core/.gitignore b/core/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/core/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpSession.java b/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpSession.java index 4b1471dc..13c59ed3 100644 --- a/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpSession.java +++ b/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpSession.java @@ -219,7 +219,7 @@ public void write(FtpReply reply) throws FtpException { public boolean isSecure() { // TODO Auto-generated method stub - return ioSession.isSecure(); + return ioSession.isSecured(); } /** diff --git a/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java b/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java index 330c387e..4aada69b 100644 --- a/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java +++ b/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java @@ -770,7 +770,7 @@ public boolean isWriterIdle() { * * @return true if the control socket is secured */ - public boolean isSecure() { + public boolean isSecured() { return getFilterChain().contains(SslFilter.class); } diff --git a/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java b/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java index 28452b5b..8aa579c4 100644 --- a/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java +++ b/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java @@ -71,6 +71,10 @@ public void sessionClosed(IoSession session) throws Exception { FtpIoSession ftpSession = new FtpIoSession(session, context); ftpHandler.sessionClosed(ftpSession); } + public void inputClosed(IoSession session) throws Exception { + FtpIoSession ftpSession = new FtpIoSession(session, context); + ftpHandler.sessionClosed(ftpSession); + } public void sessionCreated(IoSession session) throws Exception { FtpIoSession ftpSession = new FtpIoSession(session, context); diff --git a/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java b/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java index 69b0df0a..1921bc93 100644 --- a/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java +++ b/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java @@ -56,7 +56,7 @@ protected boolean expectDataConnectionSecure() { * already tested by login in setup but an explicit test is good anyways. */ public void testCommandChannel() throws Exception { - assertTrue(getActiveSession().isSecure()); + assertTrue(getActiveSession().isSecured()); assertEquals(expectDataConnectionSecure(), getActiveSession().getDataConnection().isSecure()); @@ -64,7 +64,7 @@ public void testCommandChannel() throws Exception { } public void testReissueAuth() throws Exception { - assertTrue(getActiveSession().isSecure()); + assertTrue(getActiveSession().isSecured()); assertTrue(FTPReply.isPositiveCompletion(client.noop())); // we do not accept reissued AUTH or AUTH on implicitly secured socket @@ -72,7 +72,7 @@ public void testReissueAuth() throws Exception { } public void testIsSecure() { - assertTrue(getActiveSession().isSecure()); + assertTrue(getActiveSession().isSecured()); } public void testStoreWithProtPInPassiveMode() throws Exception { diff --git a/examples/.gitignore b/examples/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/examples/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/examples/ftpserver-example-spring-war/.gitignore b/examples/ftpserver-example-spring-war/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/examples/ftpserver-example-spring-war/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/examples/ftpserver-osgi-ftplet-service/.gitignore b/examples/ftpserver-osgi-ftplet-service/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/examples/ftpserver-osgi-ftplet-service/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/examples/ftpserver-osgi-spring-service/.gitignore b/examples/ftpserver-osgi-spring-service/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/examples/ftpserver-osgi-spring-service/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/ftplet-api/.gitignore b/ftplet-api/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/ftplet-api/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/pom.xml b/pom.xml index 75a8e7a2..56cefea9 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ org.apache.mina mina-core - 2.0.4 + 2.0.9 @@ -173,13 +173,13 @@ org.slf4j slf4j-api - 1.6.4 + 1.6.6 org.slf4j jcl-over-slf4j - 1.6.4 + 1.6.6 @@ -192,31 +192,31 @@ commons-net commons-net - 2.0 + 3.4 org.slf4j slf4j-log4j12 - 1.6.4 + 1.6.6 log4j log4j - 1.2.14 + 1.2.17 commons-codec commons-codec - 1.3 + 1.10 hsqldb hsqldb - 1.8.0.7 + 1.8.0.10