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/08/13 13:30:50 UTC
svn commit: r685522 - in /mina/ftpserver/trunk/core/src:
main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
test/resources/spring-config/config-spring-1.xml
Author: ngn
Date: Wed Aug 13 04:30:49 2008
New Revision: 685522
URL: http://svn.apache.org/viewvc?rev=685522&view=rev
Log:
Setting the correct property on NioListener for local addressn (FTPSERVER-153)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.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/ListenerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java?rev=685522&r1=685521&r2=685522&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java Wed Aug 13 04:30:49 2008
@@ -133,7 +133,7 @@
}
InetAddress localAddress = SpringUtil.parseInetAddress(element, "local-address");
if(localAddress != null) {
- builder.addPropertyValue("localAddress", localAddress);
+ builder.addPropertyValue("serverAddress", localAddress);
}
builder.addPropertyValue("implicitSsl", SpringUtil.parseBoolean(element, "implicit-ssl", false));
}
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=685522&r1=685521&r2=685522&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 13 04:30:49 2008
@@ -43,7 +43,6 @@
XmlBeanFactory factory = new XmlBeanFactory(new FileSystemResource("src/test/resources/spring-config/config-spring-1.xml"));
FtpServer server = (FtpServer) factory.getBean("server");
- server.start();
assertEquals(500, server.getConnectionConfig().getMaxLogins());
assertEquals(false, server.getConnectionConfig().isAnonymousLoginEnabled());
@@ -58,6 +57,7 @@
assertNotNull(listener);
assertTrue(listener instanceof NioListener);
assertEquals(2222, ((NioListener)listener).getPort());
+ assertEquals(InetAddress.getByName("1.2.3.4"), ((NioListener)listener).getServerAddress());
assertEquals(true, ((NioListener)listener).getDataConnectionConfiguration().isActiveEnabled());
assertEquals(InetAddress.getByName("1.2.3.4"), ((NioListener)listener).getDataConnectionConfiguration().getActiveLocalAddress());
assertEquals("123-125", ((NioListener)listener).getDataConnectionConfiguration().getPassivePorts());
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=685522&r1=685521&r2=685522&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 13 04:30:49 2008
@@ -33,7 +33,7 @@
<listeners>
- <nio-listener name="listener0" port="2222">
+ <nio-listener name="listener0" port="2222" local-address="1.2.3.4">
<ssl>
<keystore file="/tmp/tmp.jks" password="password"/>
</ssl>