From c347761ca5c98adf93d50e9c166d79f6d1998bce Mon Sep 17 00:00:00 2001 From: ericsimmerman Date: Fri, 25 Dec 2015 12:26:23 -0500 Subject: [PATCH 1/2] Update of several libraries to latest stable major versions --- ..gitignore.un~ | Bin 0 -> 1393 bytes .classpath | 13 ++++++++++ .gitignore | 3 +++ .project | 23 +++++++++++++++++ .settings/org.eclipse.core.resources.prefs | 2 ++ .settings/org.eclipse.m2e.core.prefs | 4 +++ core/.classpath | 23 +++++++++++++++++ core/.gitignore | 1 + core/.project | 19 ++++++++++++++ core/.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../ftpserver/impl/DefaultFtpSession.java | 2 +- .../apache/ftpserver/impl/FtpIoSession.java | 2 +- .../listener/nio/FtpHandlerAdapter.java | 4 +++ .../ssl/ExplicitSecurityTestTemplate.java | 6 ++--- examples/.gitignore | 1 + .../ftpserver-example-spring-war/.classpath | 24 ++++++++++++++++++ .../ftpserver-example-spring-war/.gitignore | 1 + .../ftpserver-example-spring-war/.project | 20 +++++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../ftpserver-osgi-ftplet-service/.classpath | 8 ++++++ .../ftpserver-osgi-ftplet-service/.gitignore | 1 + .../ftpserver-osgi-ftplet-service/.project | 15 +++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ .../ftpserver-osgi-spring-service/.classpath | 11 ++++++++ .../ftpserver-osgi-spring-service/.gitignore | 1 + .../ftpserver-osgi-spring-service/.project | 16 ++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ ftplet-api/.classpath | 8 ++++++ ftplet-api/.gitignore | 1 + ftplet-api/.project | 16 ++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 5 ++++ pom.xml | 16 ++++++------ 32 files changed, 253 insertions(+), 13 deletions(-) create mode 100644 ..gitignore.un~ create mode 100644 .classpath create mode 100644 .gitignore create mode 100644 .project create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 .settings/org.eclipse.m2e.core.prefs create mode 100644 core/.classpath create mode 100644 core/.gitignore create mode 100644 core/.project create mode 100644 core/.settings/org.eclipse.jdt.core.prefs create mode 100644 examples/.gitignore create mode 100644 examples/ftpserver-example-spring-war/.classpath create mode 100644 examples/ftpserver-example-spring-war/.gitignore create mode 100644 examples/ftpserver-example-spring-war/.project create mode 100644 examples/ftpserver-example-spring-war/.settings/org.eclipse.jdt.core.prefs create mode 100644 examples/ftpserver-osgi-ftplet-service/.classpath create mode 100644 examples/ftpserver-osgi-ftplet-service/.gitignore create mode 100644 examples/ftpserver-osgi-ftplet-service/.project create mode 100644 examples/ftpserver-osgi-ftplet-service/.settings/org.eclipse.jdt.core.prefs create mode 100644 examples/ftpserver-osgi-spring-service/.classpath create mode 100644 examples/ftpserver-osgi-spring-service/.gitignore create mode 100644 examples/ftpserver-osgi-spring-service/.project create mode 100644 examples/ftpserver-osgi-spring-service/.settings/org.eclipse.jdt.core.prefs create mode 100644 ftplet-api/.classpath create mode 100644 ftplet-api/.gitignore create mode 100644 ftplet-api/.project create mode 100644 ftplet-api/.settings/org.eclipse.jdt.core.prefs diff --git a/..gitignore.un~ b/..gitignore.un~ new file mode 100644 index 0000000000000000000000000000000000000000..0f8b9e867782ed0d1a6fa03d14cd92ada0a93b0b GIT binary patch literal 1393 zcmWH`%$*;a=aT=FfysETce>d6b0%BG#XK|=nGR2%^}}Z?i~63=-33fm_g)`hU|?Vd zVh;V1#G>@n5`8G25lDkDNDc%*Gz>F@)s`J*fvAYT0G4K8V1m*h3M2*R{|5rF2$F(P zCN)C<7#+L8(ZRs*RRTHaL6(>{f};pIE + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..2dab65d0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/bin/ +/target/ +/**/target/ diff --git a/.project b/.project new file mode 100644 index 00000000..5b665b76 --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + ftpserver + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..99f26c02 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..f897a7f1 --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/core/.classpath b/core/.classpath new file mode 100644 index 00000000..4b44e2fb --- /dev/null +++ b/core/.classpath @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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/.project b/core/.project new file mode 100644 index 00000000..03a2d97d --- /dev/null +++ b/core/.project @@ -0,0 +1,19 @@ + + ftpserver-core + The Apache Software Foundation provides support for the Apache community of open-source software projects. + The Apache projects are characterized by a collaborative, consensus based development process, an open and + pragmatic software license, and a desire to create high quality software that leads the way in its field. + We consider ourselves not simply a group of projects sharing a server, but rather a community of developers + and users. + + ftplet-api + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..426b9357 --- /dev/null +++ b/core/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +#Fri Dec 25 12:00:20 EST 2015 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 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/.classpath b/examples/ftpserver-example-spring-war/.classpath new file mode 100644 index 00000000..06cdee21 --- /dev/null +++ b/examples/ftpserver-example-spring-war/.classpath @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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-example-spring-war/.project b/examples/ftpserver-example-spring-war/.project new file mode 100644 index 00000000..35a1a04c --- /dev/null +++ b/examples/ftpserver-example-spring-war/.project @@ -0,0 +1,20 @@ + + ftpserver-spring-war + The Apache Software Foundation provides support for the Apache community of open-source software projects. + The Apache projects are characterized by a collaborative, consensus based development process, an open and + pragmatic software license, and a desire to create high quality software that leads the way in its field. + We consider ourselves not simply a group of projects sharing a server, but rather a community of developers + and users. + + ftplet-api + ftpserver-core + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file diff --git a/examples/ftpserver-example-spring-war/.settings/org.eclipse.jdt.core.prefs b/examples/ftpserver-example-spring-war/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..bab28c5d --- /dev/null +++ b/examples/ftpserver-example-spring-war/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +#Fri Dec 25 12:00:23 EST 2015 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/examples/ftpserver-osgi-ftplet-service/.classpath b/examples/ftpserver-osgi-ftplet-service/.classpath new file mode 100644 index 00000000..a82a3375 --- /dev/null +++ b/examples/ftpserver-osgi-ftplet-service/.classpath @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file 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-ftplet-service/.project b/examples/ftpserver-osgi-ftplet-service/.project new file mode 100644 index 00000000..c578eae4 --- /dev/null +++ b/examples/ftpserver-osgi-ftplet-service/.project @@ -0,0 +1,15 @@ + + ftpserver-osgi-ftplet-service + Simple example where an Ftplet is published as a OSGi service. Another bundle, using the white-board pattern can locate this and plug it into a running server. + + ftplet-api + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file diff --git a/examples/ftpserver-osgi-ftplet-service/.settings/org.eclipse.jdt.core.prefs b/examples/ftpserver-osgi-ftplet-service/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..bab28c5d --- /dev/null +++ b/examples/ftpserver-osgi-ftplet-service/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +#Fri Dec 25 12:00:23 EST 2015 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/examples/ftpserver-osgi-spring-service/.classpath b/examples/ftpserver-osgi-spring-service/.classpath new file mode 100644 index 00000000..91d31c20 --- /dev/null +++ b/examples/ftpserver-osgi-spring-service/.classpath @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file 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/examples/ftpserver-osgi-spring-service/.project b/examples/ftpserver-osgi-spring-service/.project new file mode 100644 index 00000000..fd7b6ab2 --- /dev/null +++ b/examples/ftpserver-osgi-spring-service/.project @@ -0,0 +1,16 @@ + + ftpserver-osgi-spring-service + Spring-DM based OSGi bundle that starts an FtpServer and looks for a published Ftplet service. + + ftplet-api + ftpserver-core + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file diff --git a/examples/ftpserver-osgi-spring-service/.settings/org.eclipse.jdt.core.prefs b/examples/ftpserver-osgi-spring-service/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..bab28c5d --- /dev/null +++ b/examples/ftpserver-osgi-spring-service/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +#Fri Dec 25 12:00:23 EST 2015 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/ftplet-api/.classpath b/ftplet-api/.classpath new file mode 100644 index 00000000..7df2338f --- /dev/null +++ b/ftplet-api/.classpath @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file 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/ftplet-api/.project b/ftplet-api/.project new file mode 100644 index 00000000..b43bef81 --- /dev/null +++ b/ftplet-api/.project @@ -0,0 +1,16 @@ + + ftplet-api + Ftplets are, similar to servlets, an API to plug into the + request lifecycle of FtpServer. Ftplets are called on session connect + and disconnect as well as before and after each command within a user + session. + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file diff --git a/ftplet-api/.settings/org.eclipse.jdt.core.prefs b/ftplet-api/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..61923913 --- /dev/null +++ b/ftplet-api/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +#Fri Dec 25 12:00:18 EST 2015 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 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 From 4a2fdad617299f73e193c0622d53239215c22684 Mon Sep 17 00:00:00 2001 From: ericsimmerman Date: Fri, 25 Dec 2015 21:20:09 -0500 Subject: [PATCH 2/2] Remove eclipse working files --- ..gitignore.un~ | Bin 1393 -> 4860 bytes .classpath | 13 ---------- .gitignore | 6 +++++ .project | 23 ----------------- .settings/org.eclipse.core.resources.prefs | 2 -- .settings/org.eclipse.m2e.core.prefs | 4 --- core/.classpath | 23 ----------------- core/.project | 19 -------------- core/.settings/org.eclipse.jdt.core.prefs | 5 ---- .../ftpserver-example-spring-war/.classpath | 24 ------------------ .../ftpserver-example-spring-war/.project | 20 --------------- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../ftpserver-osgi-ftplet-service/.classpath | 8 ------ .../ftpserver-osgi-ftplet-service/.project | 15 ----------- .../.settings/org.eclipse.jdt.core.prefs | 5 ---- .../ftpserver-osgi-spring-service/.classpath | 11 -------- .../ftpserver-osgi-spring-service/.project | 16 ------------ .../.settings/org.eclipse.jdt.core.prefs | 5 ---- ftplet-api/.classpath | 8 ------ ftplet-api/.project | 16 ------------ .../.settings/org.eclipse.jdt.core.prefs | 5 ---- 21 files changed, 6 insertions(+), 227 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 .settings/org.eclipse.core.resources.prefs delete mode 100644 .settings/org.eclipse.m2e.core.prefs delete mode 100644 core/.classpath delete mode 100644 core/.project delete mode 100644 core/.settings/org.eclipse.jdt.core.prefs delete mode 100644 examples/ftpserver-example-spring-war/.classpath delete mode 100644 examples/ftpserver-example-spring-war/.project delete mode 100644 examples/ftpserver-example-spring-war/.settings/org.eclipse.jdt.core.prefs delete mode 100644 examples/ftpserver-osgi-ftplet-service/.classpath delete mode 100644 examples/ftpserver-osgi-ftplet-service/.project delete mode 100644 examples/ftpserver-osgi-ftplet-service/.settings/org.eclipse.jdt.core.prefs delete mode 100644 examples/ftpserver-osgi-spring-service/.classpath delete mode 100644 examples/ftpserver-osgi-spring-service/.project delete mode 100644 examples/ftpserver-osgi-spring-service/.settings/org.eclipse.jdt.core.prefs delete mode 100644 ftplet-api/.classpath delete mode 100644 ftplet-api/.project delete mode 100644 ftplet-api/.settings/org.eclipse.jdt.core.prefs diff --git a/..gitignore.un~ b/..gitignore.un~ index 0f8b9e867782ed0d1a6fa03d14cd92ada0a93b0b..182147a394a3309ded1cbdb59c52740f71f81a92 100644 GIT binary patch literal 4860 zcmeI$O)mpM7zgm_3#vuDT=)PkJ#^DUzX2!bwnu5CsTHcR8%{kqadLDM7Y=*{5`tre zASBLS;sXd5;rY+btf!?;rl)z5>Fmx#BLYFf@k>jUvhOG^@Wk1GKxMgDLd+f#*NNnc{G3tX>T_ILG@Hr5gH=-p z_|PU-P&>nPT1?gSOe#vU=IPXWB1w$5027xs=7^l$t43H$)AkZf~w?r&6Mh=PSoD+qq$KBN4 z0wmb@>p&kAIsYt?PK&9Uh%Pvh<^Tzny_WYeg$5w`TvEeAZxoBB5@NO@v@4Fr=T&<& z0O=QKj1Pbo4Vmaj5ZcXOXhZVL2W>LKj~{BX@rj0!!qB>P#0)nfw_E8J3%2sDlWipU LVztsN_q_iFEO@I_ delta 124 zcmeyP`jIO$EHih0Xr4>{QwApEx!&nw>(7~N6&Lf+P-Hqhebx`3tt{$$K6e)|S>1bm zfPsO58HhRbOA?FHQ%m%rd`2J*!XP;i0MRha5LR1um<6n2V}1-XBg5u1%qtn0p05G` DG - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index 2dab65d0..52638dc8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ /bin/ /target/ /**/target/ +.classpath +.project +.settings/ +/**/.classpath +/**/.project +/**/.settings/ diff --git a/.project b/.project deleted file mode 100644 index 5b665b76..00000000 --- a/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - ftpserver - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1..00000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/core/.classpath b/core/.classpath deleted file mode 100644 index 4b44e2fb..00000000 --- a/core/.classpath +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/.project b/core/.project deleted file mode 100644 index 03a2d97d..00000000 --- a/core/.project +++ /dev/null @@ -1,19 +0,0 @@ - - ftpserver-core - The Apache Software Foundation provides support for the Apache community of open-source software projects. - The Apache projects are characterized by a collaborative, consensus based development process, an open and - pragmatic software license, and a desire to create high quality software that leads the way in its field. - We consider ourselves not simply a group of projects sharing a server, but rather a community of developers - and users. - - ftplet-api - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - - \ No newline at end of file diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 426b9357..00000000 --- a/core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Fri Dec 25 12:00:20 EST 2015 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/examples/ftpserver-example-spring-war/.classpath b/examples/ftpserver-example-spring-war/.classpath deleted file mode 100644 index 06cdee21..00000000 --- a/examples/ftpserver-example-spring-war/.classpath +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/ftpserver-example-spring-war/.project b/examples/ftpserver-example-spring-war/.project deleted file mode 100644 index 35a1a04c..00000000 --- a/examples/ftpserver-example-spring-war/.project +++ /dev/null @@ -1,20 +0,0 @@ - - ftpserver-spring-war - The Apache Software Foundation provides support for the Apache community of open-source software projects. - The Apache projects are characterized by a collaborative, consensus based development process, an open and - pragmatic software license, and a desire to create high quality software that leads the way in its field. - We consider ourselves not simply a group of projects sharing a server, but rather a community of developers - and users. - - ftplet-api - ftpserver-core - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - - \ No newline at end of file diff --git a/examples/ftpserver-example-spring-war/.settings/org.eclipse.jdt.core.prefs b/examples/ftpserver-example-spring-war/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bab28c5d..00000000 --- a/examples/ftpserver-example-spring-war/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Fri Dec 25 12:00:23 EST 2015 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/examples/ftpserver-osgi-ftplet-service/.classpath b/examples/ftpserver-osgi-ftplet-service/.classpath deleted file mode 100644 index a82a3375..00000000 --- a/examples/ftpserver-osgi-ftplet-service/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/examples/ftpserver-osgi-ftplet-service/.project b/examples/ftpserver-osgi-ftplet-service/.project deleted file mode 100644 index c578eae4..00000000 --- a/examples/ftpserver-osgi-ftplet-service/.project +++ /dev/null @@ -1,15 +0,0 @@ - - ftpserver-osgi-ftplet-service - Simple example where an Ftplet is published as a OSGi service. Another bundle, using the white-board pattern can locate this and plug it into a running server. - - ftplet-api - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - - \ No newline at end of file diff --git a/examples/ftpserver-osgi-ftplet-service/.settings/org.eclipse.jdt.core.prefs b/examples/ftpserver-osgi-ftplet-service/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bab28c5d..00000000 --- a/examples/ftpserver-osgi-ftplet-service/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Fri Dec 25 12:00:23 EST 2015 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/examples/ftpserver-osgi-spring-service/.classpath b/examples/ftpserver-osgi-spring-service/.classpath deleted file mode 100644 index 91d31c20..00000000 --- a/examples/ftpserver-osgi-spring-service/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/examples/ftpserver-osgi-spring-service/.project b/examples/ftpserver-osgi-spring-service/.project deleted file mode 100644 index fd7b6ab2..00000000 --- a/examples/ftpserver-osgi-spring-service/.project +++ /dev/null @@ -1,16 +0,0 @@ - - ftpserver-osgi-spring-service - Spring-DM based OSGi bundle that starts an FtpServer and looks for a published Ftplet service. - - ftplet-api - ftpserver-core - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - - \ No newline at end of file diff --git a/examples/ftpserver-osgi-spring-service/.settings/org.eclipse.jdt.core.prefs b/examples/ftpserver-osgi-spring-service/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bab28c5d..00000000 --- a/examples/ftpserver-osgi-spring-service/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Fri Dec 25 12:00:23 EST 2015 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/ftplet-api/.classpath b/ftplet-api/.classpath deleted file mode 100644 index 7df2338f..00000000 --- a/ftplet-api/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ftplet-api/.project b/ftplet-api/.project deleted file mode 100644 index b43bef81..00000000 --- a/ftplet-api/.project +++ /dev/null @@ -1,16 +0,0 @@ - - ftplet-api - Ftplets are, similar to servlets, an API to plug into the - request lifecycle of FtpServer. Ftplets are called on session connect - and disconnect as well as before and after each command within a user - session. - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - - \ No newline at end of file diff --git a/ftplet-api/.settings/org.eclipse.jdt.core.prefs b/ftplet-api/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 61923913..00000000 --- a/ftplet-api/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Fri Dec 25 12:00:18 EST 2015 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5