You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/11/07 21:23:45 UTC
svn commit: r712254 - in /mina/ftpserver/trunk/core/src:
main/resources/org/apache/ftpserver/config/spring/ftpserver-1.0.xsd
test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
test/resources/spring-config/config-spring-1.xml
Author: ngn
Date: Fri Nov 7 12:23:45 2008
New Revision: 712254
URL: http://svn.apache.org/viewvc?rev=712254&view=rev
Log:
XML config does not allow multiple ftplets to be configured (FTPSERVER-217)
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=712254&r1=712253&r2=712254&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 Fri Nov 7 12:23:45 2008
@@ -144,10 +144,10 @@
<xs:element name="ftplets">
<xs:complexType>
<xs:sequence>
- <xs:element name="ftplet">
+ <xs:element name="ftplet" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
- <xs:choice maxOccurs="unbounded">
+ <xs:choice>
<xs:element ref="beans:bean" />
<xs:element ref="beans:ref" />
</xs:choice>
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=712254&r1=712253&r2=712254&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 Fri Nov 7 12:23:45 2008
@@ -107,5 +107,9 @@
NativeFileSystemFactory fs = (NativeFileSystemFactory) server.getFileSystem();
assertTrue(fs.isCreateHome());
assertTrue(fs.isCaseInsensitive());
+
+ assertEquals(2, server.getFtplets().size());
+ assertEquals(123, ((TestFtplet)server.getFtplets().get("ftplet1")).getFoo());
+ assertEquals(223, ((TestFtplet)server.getFtplets().get("ftplet2")).getFoo());
}
}
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=712254&r1=712253&r2=712254&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 Fri Nov 7 12:23:45 2008
@@ -61,8 +61,12 @@
<beans:bean class="org.apache.ftpserver.config.spring.TestFtplet">
<beans:property name="foo" value="123"/>
</beans:bean>
-
</ftplet>
+ <ftplet name="ftplet2">
+ <beans:bean class="org.apache.ftpserver.config.spring.TestFtplet">
+ <beans:property name="foo" value="223"/>
+ </beans:bean>
+ </ftplet>
</ftplets>
<!--<file-user-manager file="src/test/resources/users.properties" encrypt-passwords="true" />-->
<user-manager>