Author: ngn
Date: Wed Aug 6 08:41:18 2008
New Revision: 683302
URL: http://svn.apache.org/viewvc?rev=683302&view=rev
Log:
Fix issue with schema only allowing one command element (FTPSERVER-147).
Modified:
mina/ftpserver/trunk/core/src/main/resources/org/apache/ftpserver/config/spring/ftpserver-1.0.xsd
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/resources/org/apache/ftpserver/config/spring/ftpserver-1.0.xsd
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/resources/org/apache/ftpserver/config/spring/ftpserver-1.0.xsd?rev=683302&r1=683301&r2=683302&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/resources/org/apache/ftpserver/config/spring/ftpserver-1.0.xsd
(original)
+++
mina/ftpserver/trunk/core/src/main/resources/org/apache/ftpserver/config/spring/ftpserver-1.0.xsd
Wed Aug 6 08:41:18 2008
@@ -208,7 +208,7 @@
<xs:element name="commands">
<xs:complexType>
<xs:sequence>
- <xs:element name="command">
+ <xs:element name="command"
maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
<xs:choice
maxOccurs="unbounded">
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=683302&r1=683301&r2=683302&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
Wed Aug 6 08:41:18 2008
@@ -29,6 +29,7 @@
import org.apache.ftpserver.DefaultCommandFactory;
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.command.HELP;
+import org.apache.ftpserver.command.STAT;
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.listener.nio.NioListener;
import org.apache.ftpserver.ssl.DefaultSslConfiguration;
@@ -88,8 +89,10 @@
assertEquals(2224, ((NioListener)listener).getPort());
DefaultCommandFactory cf = (DefaultCommandFactory)
server.getServerContext().getCommandFactory();
- assertEquals(1, cf.getCommandMap().size());
+ assertEquals(2, cf.getCommandMap().size());
assertTrue(cf.getCommand("FOO") instanceof HELP);
+ assertTrue(cf.getCommand("FOO2") instanceof STAT);
+
String[] languages =
server.getServerContext().getMessageResource().getAvailableLanguages();
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=683302&r1=683301&r2=683302&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
Wed Aug 6 08:41:18 2008
@@ -73,6 +73,9 @@
<command name="FOO">
<beans:bean class="org.apache.ftpserver.command.HELP"
/>
</command>
+ <command name="FOO2">
+ <beans:bean class="org.apache.ftpserver.command.STAT" />
+ </command>
</commands>
<messages languages="se no ,da" />
</server>
