Author: ngn
Date: Tue Aug 19 03:33:30 2008
New Revision: 687013
URL: http://svn.apache.org/viewvc?rev=687013&view=rev
Log:
FileSystemBeanDefinitionParser tries to set the property "create-home" instead
of createHome (FTPSERVER-165)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java?rev=687013&r1=687012&r2=687013&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java
Tue Aug 19 03:33:30 2008
@@ -57,7 +57,7 @@
.parseBoolean(element.getAttribute("case-insensitive")));
}
if (StringUtils.hasText(element.getAttribute("create-home"))) {
- builder.addPropertyValue("create-home", Boolean
+ builder.addPropertyValue("createHome", Boolean
.parseBoolean(element.getAttribute("create-home")));
}
}
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java?rev=687013&r1=687012&r2=687013&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
Tue Aug 19 03:33:30 2008
@@ -30,6 +30,7 @@
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.command.HELP;
import org.apache.ftpserver.command.STAT;
+import org.apache.ftpserver.filesystem.NativeFileSystemManager;
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.listener.nio.NioListener;
import org.apache.ftpserver.ssl.DefaultSslConfiguration;
@@ -118,5 +119,9 @@
assertEquals("se", languages[0]);
assertEquals("no", languages[1]);
assertEquals("da", languages[2]);
+
+ NativeFileSystemManager fs = (NativeFileSystemManager)
server.getFileSystem();
+ assertTrue(fs.isCreateHome());
+ assertTrue(fs.isCaseInsensitive());
}
}
Modified:
mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml?rev=687013&r1=687012&r2=687013&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml
(original)
+++
mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml
Tue Aug 19 03:33:30 2008
@@ -68,7 +68,7 @@
<user-manager>
<beans:bean
class="org.apache.ftpserver.usermanager.PropertiesUserManager"/>
</user-manager>
- <native-filesystem case-insensitive="false" />
+ <native-filesystem case-insensitive="true" create-home="true" />
<commands use-default="false">
<command name="FOO">
<beans:bean class="org.apache.ftpserver.command.HELP"
/>
