Fix #23 PWD response should have commentary; Also adjusted reply text for MKD to adhere to RFC959

git-svn-id: svn://svn.code.sf.net/p/mockftpserver/code@267 531de8e6-9941-0410-b38b-9a92acbe0330

5 files changed, 49 insertions, 32 deletions

diff --git a/MockFtpServer/CHANGELOG.txt b/MockFtpServer/CHANGELOG.txt
index 33430c5..c37a025 100644
--- a/MockFtpServer/CHANGELOG.txt
+++ b/MockFtpServer/CHANGELOG.txt
@@ -1,6 +1,13 @@
 MockFtpServer Change Log

 -------------------------------------------------------------------------------

 

+Changes in version 2.5 (?? ??? 2014)

+------------------------------------------

+- Fix #23 PWD response should have commentary: "{0}" is current directory.

+  Also adjusted reply text for MKD to adhere to RFC959: "{0}" created.

+- Removed deprecation of assertSessionReply(int,Object)

+

+

 Changes in version 2.4 (15 Jul 2012)

 ------------------------------------------

 - FEATURE #2466395: Remove log4j dependency. Switch to using SLF4J (http://www.slf4j.org/).

diff --git a/MockFtpServer/MockFtpServer.eml b/MockFtpServer/MockFtpServer.eml
index b42c76b..791e958 100644
--- a/MockFtpServer/MockFtpServer.eml
+++ b/MockFtpServer/MockFtpServer.eml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<component LANGUAGE_LEVEL="JDK_1_4">

+<component LANGUAGE_LEVEL="JDK_1_4" jdk="$project_jdk_name$" jdk_type="JavaSDK">

 	<output-test url="file://$MODULE_DIR$/target/test-classes"/>

 	<contentEntry url="file://$MODULE_DIR$">

-		<testFolder url="file://$MODULE_DIR$/src/test/java"/>

 		<testFolder url="file://$MODULE_DIR$/src/test/groovy"/>

+		<testFolder url="file://$MODULE_DIR$/src/test/java"/>

 		<testFolder url="file://$MODULE_DIR$/src/test/resources"/>

 		<excludeFolder url="file://$MODULE_DIR$/target"/>

 	</contentEntry>

@@ -22,4 +22,23 @@
 	<lib name="Maven: avalon-framework:avalon-framework:4.1.3" scope="TEST"/>

 	<lib name="Maven: javax.servlet:servlet-api:2.3" scope="TEST"/>

 	<lib name="Maven: org.slf4j:slf4j-log4j12:1.6.6" scope="TEST"/>

+	<levels>

+		<level name="Groovy 1.7.10" value="project"/>

+		<level name="Maven: org.slf4j:slf4j-api:1.6.6" value="project"/>

+		<level name="Maven: org.codehaus.groovy:groovy-all:1.7.10" value="project"/>

+		<level name="Maven: commons-net:commons-net:1.4.1" value="project"/>

+		<level name="Maven: oro:oro:2.0.8" value="project"/>

+		<level name="Maven: easymock:easymock:1.2_Java1.3" value="project"/>

+		<level name="Maven: junit-addons:junit-addons:1.4" value="project"/>

+		<level name="Maven: junit:junit:3.8.1" value="project"/>

+		<level name="Maven: xerces:xercesImpl:2.6.2" value="project"/>

+		<level name="Maven: xerces:xmlParserAPIs:2.6.2" value="project"/>

+		<level name="Maven: org.springframework:spring:2.0.7" value="project"/>

+		<level name="Maven: commons-logging:commons-logging:1.1" value="project"/>

+		<level name="Maven: log4j:log4j:1.2.17" value="project"/>

+		<level name="Maven: logkit:logkit:1.0.1" value="project"/>

+		<level name="Maven: avalon-framework:avalon-framework:4.1.3" value="project"/>

+		<level name="Maven: javax.servlet:servlet-api:2.3" value="project"/>

+		<level name="Maven: org.slf4j:slf4j-log4j12:1.6.6" value="project"/>

+	</levels>

 </component>

diff --git a/MockFtpServer/MockFtpServer.ipr b/MockFtpServer/MockFtpServer.ipr
index 5ae98af..4bee721 100644
--- a/MockFtpServer/MockFtpServer.ipr
+++ b/MockFtpServer/MockFtpServer.ipr
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <project version="4">

-  <component name="AntConfiguration">

-    <defaultAnt bundledAnt="true" />

-  </component>

   <component name="BuildJarProjectSettings">

     <option name="BUILD_JARS_ON_MAKE" value="false" />

   </component>

@@ -73,7 +70,11 @@
       <entry name="?*.dtd" />

       <entry name="?*.tld" />

     </wildcardResourcePatterns>

-    <annotationProcessing enabled="false" useClasspath="true" />

+    <annotationProcessing>

+      <profile default="true" name="Default" enabled="false">

+        <processorPath useClasspath="true" />

+      </profile>

+    </annotationProcessing>

   </component>

   <component name="CopyrightManager" default="">

     <module2copyright />

@@ -124,7 +125,6 @@
     <option name="originalFiles">

       <list>

         <option value="$PROJECT_DIR$/pom.xml" />

-        <option value="$PROJECT_DIR$/pom.xml" />

       </list>

     </option>

   </component>

@@ -249,6 +249,20 @@
       </item>

     </group>

   </component>

+  <component name="ProjectCodeStyleSettingsManager">

+    <option name="PER_PROJECT_SETTINGS">

+      <value>

+        <XML>

+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />

+        </XML>

+        <codeStyleSettings language="JavaScript">

+          <indentOptions>

+            <option name="CONTINUATION_INDENT_SIZE" value="8" />

+          </indentOptions>

+        </codeStyleSettings>

+      </value>

+    </option>

+  </component>

   <component name="ProjectDetails">

     <option name="projectName" value="MockFtpServer" />

   </component>

@@ -291,25 +305,6 @@
         <entry key="$PROJECT_DIR$">

           <value>

             <SvnBranchConfiguration>

-              <option name="branchMap">

-                <map>

-                  <entry key="https://mockftpserver.svn.sourceforge.net/svnroot/mockftpserver/branches/1.x_Branch">

-                    <value>

-                      <list />

-                    </value>

-                  </entry>

-                  <entry key="https://mockftpserver.svn.sourceforge.net/svnroot/mockftpserver/tags">

-                    <value>

-                      <list />

-                    </value>

-                  </entry>

-                  <entry key="https://mockftpserver.svn.sourceforge.net/svnroot/mockftpserver/tags/1.2.4">

-                    <value>

-                      <list />

-                    </value>

-                  </entry>

-                </map>

-              </option>

               <option name="branchUrls">

                 <list>

                   <option value="https://mockftpserver.svn.sourceforge.net/svnroot/mockftpserver/branches/1.x_Branch" />

diff --git a/MockFtpServer/src/main/resources/ReplyText.properties b/MockFtpServer/src/main/resources/ReplyText.properties
index f730b42..8146fbe 100644
--- a/MockFtpServer/src/main/resources/ReplyText.properties
+++ b/MockFtpServer/src/main/resources/ReplyText.properties
@@ -78,7 +78,7 @@ eprt=EPRT completed.
 epsv=Entering Extended Passive Mode (|||{0}|)

 help={0}.

 help.noHelpTextDefined=No help text has been defined for [{0}]

-mkd={0} created.

+mkd="{0}" created.

 mode=MODE completed.

 noop=NOOP completed.

 pass=User logged in, proceed.

@@ -86,7 +86,7 @@ pass.needAccount=Need account for login.
 pass.loginFailed=Not logged in.

 pasv=({0})

 port=PORT completed.

-pwd="{0}"

+pwd="{0}" is current directory.

 quit=Service closing control connection.

 rein=REIN completed.

 rest=REST completed.

diff --git a/MockFtpServer/src/test/groovy/org/mockftpserver/fake/command/PwdCommandHandlerTest.groovy b/MockFtpServer/src/test/groovy/org/mockftpserver/fake/command/PwdCommandHandlerTest.groovy
index 49bad17..a26d451 100644
--- a/MockFtpServer/src/test/groovy/org/mockftpserver/fake/command/PwdCommandHandlerTest.groovy
+++ b/MockFtpServer/src/test/groovy/org/mockftpserver/fake/command/PwdCommandHandlerTest.groovy
@@ -49,10 +49,6 @@ class PwdCommandHandlerTest extends AbstractFakeCommandHandlerTestCase {
     // Helper Methods
     //-------------------------------------------------------------------------
 
-    void setUp() {
-        super.setUp()
-    }
-
     CommandHandler createCommandHandler() {
         new PwdCommandHandler()
     }