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/06/12 13:56:14 UTC

svn commit: r667055 - in /mina/ftpserver/trunk: core/ core/src/main/java/org/apache/ftpserver/ core/src/main/java/org/apache/ftpserver/config/spring/ core/src/main/java/org/apache/ftpserver/interfaces/ core/src/main/java/org/apache/ftpserver/listener/ ...

Author: ngn
Date: Thu Jun 12 04:56:13 2008
New Revision: 667055

URL: http://svn.apache.org/viewvc?rev=667055&view=rev
Log:
Fixing missing license headers
Renamed MinaListener to NioListener

Removed:
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ConnectionObserver.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/mina/
Modified:
    mina/ftpserver/trunk/core/pom.xml
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/CommandFactoryBeanDefinitionParser.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FtpServerNamespaceHandler.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java
    mina/ftpserver/trunk/core/src/main/resources/META-INF/spring.handlers
    mina/ftpserver/trunk/core/src/main/resources/META-INF/spring.schemas
    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/clienttests/ClientTestTemplate.java
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/TestFtplet.java
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileObjectTestTemplate.java
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
    mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
    mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml
    mina/ftpserver/trunk/server/pom.xml
    mina/ftpserver/trunk/server/src/test/java/org/apache/ftpserver/ConfigurableFtpServerContextTest.java
    mina/ftpserver/trunk/server/src/test/java/org/apache/ftpserver/test/TestUtil.java

Modified: mina/ftpserver/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/pom.xml?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/pom.xml (original)
+++ mina/ftpserver/trunk/core/pom.xml Thu Jun 12 04:56:13 2008
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License. -->  
+
 <project>
 	<parent>
 		<artifactId>ftpserver-parent</artifactId>

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java Thu Jun 12 04:56:13 2008
@@ -19,7 +19,6 @@
 
 package org.apache.ftpserver;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -41,7 +40,7 @@
 import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.MessageResource;
 import org.apache.ftpserver.listener.Listener;
-import org.apache.ftpserver.listener.mina.MinaListener;
+import org.apache.ftpserver.listener.nio.NioListener;
 import org.apache.ftpserver.message.MessageResourceImpl;
 import org.apache.ftpserver.usermanager.BaseUser;
 import org.apache.ftpserver.usermanager.ConcurrentLoginPermission;
@@ -119,7 +118,7 @@
         Configuration listenersConfig = conf.subset(prefix);
         if(listenersConfig.isEmpty()) {
             // create default listener
-            Bean listenerBean = createComponent(listenersConfig, "default", MinaListener.class.getName());
+            Bean listenerBean = createComponent(listenersConfig, "default", NioListener.class.getName());
             
             map.put("default", listenerBean);
         } else {
@@ -129,7 +128,7 @@
             while (keys.hasNext()) {
                 String key = (String) keys.next();
                 
-                Bean listenerBean = createComponent(listenersConfig, key, MinaListener.class.getName());
+                Bean listenerBean = createComponent(listenersConfig, key, NioListener.class.getName());
                 
                 map.put(key, listenerBean);
             }

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java Thu Jun 12 04:56:13 2008
@@ -37,7 +37,7 @@
 import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.MessageResource;
 import org.apache.ftpserver.listener.Listener;
-import org.apache.ftpserver.listener.mina.MinaListener;
+import org.apache.ftpserver.listener.nio.NioListener;
 import org.apache.ftpserver.message.MessageResourceImpl;
 import org.apache.ftpserver.usermanager.BaseUser;
 import org.apache.ftpserver.usermanager.ConcurrentLoginPermission;
@@ -111,7 +111,7 @@
 	}
 
 	private void createListeners() throws Exception {
-		listeners.put("default", new MinaListener());
+		listeners.put("default", new NioListener());
 	}
 
 	/**

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java Thu Jun 12 04:56:13 2008
@@ -20,7 +20,6 @@
 package org.apache.ftpserver;
 
 import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.listener.ConnectionObserver;
 
 /**
  * FTP request object.
@@ -31,7 +30,6 @@
     private String command;
     private String argument;
     
-    private ConnectionObserver observer;
 
     /**
      * Default constructor.
@@ -45,9 +43,6 @@
      */
     private void parse(String lineToParse) {
         
-        // notify connection observer
-        spyRequest(lineToParse);
-        
         // parse request
         line = lineToParse.trim();
         command = null;
@@ -70,16 +65,6 @@
     }
     
     /**
-     * Spy print. Monitor user request.
-     */
-    private void spyRequest(String str) {
-        ConnectionObserver observer = this.observer;
-        if(observer != null) {
-            observer.request(str + "\r\n");
-        }
-    }
-    
-    /**
      * Get the ftp command.
      */
     public String getCommand() {

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/CommandFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/CommandFactoryBeanDefinitionParser.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/CommandFactoryBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/CommandFactoryBeanDefinitionParser.java Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.config.spring;
 
 import java.util.List;

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=667055&r1=667054&r2=667055&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 Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.config.spring;
 
 import org.apache.ftpserver.filesystem.NativeFileSystemManager;

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FtpServerNamespaceHandler.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FtpServerNamespaceHandler.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FtpServerNamespaceHandler.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FtpServerNamespaceHandler.java Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.config.spring;
 
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;

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=667055&r1=667054&r2=667055&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 Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.config.spring;
 
 import java.net.InetAddress;
@@ -9,7 +28,7 @@
 import org.apache.ftpserver.DefaultDataConnectionConfiguration.Active;
 import org.apache.ftpserver.DefaultDataConnectionConfiguration.Passive;
 import org.apache.ftpserver.interfaces.DataConnectionConfiguration;
-import org.apache.ftpserver.listener.mina.MinaListener;
+import org.apache.ftpserver.listener.nio.NioListener;
 import org.apache.ftpserver.ssl.DefaultSslConfiguration;
 import org.apache.ftpserver.ssl.SslConfiguration;
 import org.apache.mina.filter.firewall.Subnet;
@@ -29,8 +48,8 @@
      * {@inheritDoc}
      */
     @Override
-    protected Class<MinaListener> getBeanClass(Element element) {
-        return MinaListener.class;
+    protected Class<NioListener> getBeanClass(Element element) {
+        return NioListener.class;
     }
 
     /**

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.config.spring;
 
 import java.io.File;

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.config.spring;
 
 import java.io.File;

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.config.spring;
 
 import org.apache.ftpserver.ftplet.UserManager;

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.interfaces;
 
 import java.net.InetSocketAddress;

Modified: mina/ftpserver/trunk/core/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/resources/META-INF/spring.handlers?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/resources/META-INF/spring.handlers (original)
+++ mina/ftpserver/trunk/core/src/main/resources/META-INF/spring.handlers Thu Jun 12 04:56:13 2008
@@ -1 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.  
+
+
 http\://mina.apache.org/ftpserver/spring/v1=org.apache.ftpserver.config.spring.FtpServerNamespaceHandler
\ No newline at end of file

Modified: mina/ftpserver/trunk/core/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/resources/META-INF/spring.schemas?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/resources/META-INF/spring.schemas (original)
+++ mina/ftpserver/trunk/core/src/main/resources/META-INF/spring.schemas Thu Jun 12 04:56:13 2008
@@ -1 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 http\://mina.apache.org/ftpserver/ftpserver-1.0.xsd=org/apache/ftpserver/config/spring/ftpserver-1.0.xsd
\ No newline at end of file

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=667055&r1=667054&r2=667055&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 Thu Jun 12 04:56:13 2008
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License. -->  
+
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
 	targetNamespace="http://mina.apache.org/ftpserver/spring/v1"
 	xmlns="http://mina.apache.org/ftpserver/spring/v1"

Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java Thu Jun 12 04:56:13 2008
@@ -30,7 +30,7 @@
 import org.apache.commons.net.ftp.FTPConnectionClosedException;
 import org.apache.ftpserver.DefaultFtpServerContext;
 import org.apache.ftpserver.FtpServer;
-import org.apache.ftpserver.listener.mina.MinaListener;
+import org.apache.ftpserver.listener.nio.NioListener;
 import org.apache.ftpserver.test.TestUtil;
 import org.apache.ftpserver.usermanager.PropertiesUserManager;
 import org.apache.ftpserver.util.IoUtils;
@@ -65,7 +65,7 @@
 
         DefaultFtpServerContext context = new DefaultFtpServerContext(false);
 
-        MinaListener listener = new MinaListener();
+        NioListener listener = new NioListener();
         listener.setPort(port);
         context.setListener("default", listener);
         

Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java Thu Jun 12 04:56:13 2008
@@ -19,7 +19,7 @@
 
 package org.apache.ftpserver.clienttests;
 
-import org.apache.ftpserver.listener.mina.MinaListener;
+import org.apache.ftpserver.listener.nio.NioListener;
 
 
 public class ConnectTest extends ClientTestTemplate {
@@ -35,19 +35,19 @@
     }
 
     public void testPortWithZeroPort() throws Exception {
-        ((MinaListener)server.getServerContext().getListener("default")).setPort(0);
-        assertEquals(0, ((MinaListener)server.getServerContext().getListener("default")).getPort());
+        ((NioListener)server.getServerContext().getListener("default")).setPort(0);
+        assertEquals(0, ((NioListener)server.getServerContext().getListener("default")).getPort());
         
         server.start();
         
-        assertTrue(((MinaListener)server.getServerContext().getListener("default")).getPort() > 0);
+        assertTrue(((NioListener)server.getServerContext().getListener("default")).getPort() > 0);
     }
     
     public void testPort() throws Exception {
-        assertEquals(port, ((MinaListener)server.getServerContext().getListener("default")).getPort());
+        assertEquals(port, ((NioListener)server.getServerContext().getListener("default")).getPort());
         
         server.start();
         
-        assertEquals(port, ((MinaListener)server.getServerContext().getListener("default")).getPort());
+        assertEquals(port, ((NioListener)server.getServerContext().getListener("default")).getPort());
     }
 }

Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java Thu Jun 12 04:56:13 2008
@@ -25,13 +25,13 @@
 
 import org.apache.commons.net.ftp.FTPConnectionClosedException;
 import org.apache.ftpserver.FtpServer;
-import org.apache.ftpserver.listener.mina.MinaListener;
+import org.apache.ftpserver.listener.nio.NioListener;
 
 public class InetAddressBlacklistTest extends ClientTestTemplate {
     protected FtpServer createServer() throws Exception {
         FtpServer server = super.createServer();
         
-        MinaListener listener = (MinaListener) server.getServerContext().getListener("default");
+        NioListener listener = (NioListener) server.getServerContext().getListener("default");
         
         List<InetAddress> blockedAddresses = new ArrayList<InetAddress>();
         blockedAddresses.add(InetAddress.getByName("localhost"));

Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java Thu Jun 12 04:56:13 2008
@@ -25,14 +25,14 @@
 
 import org.apache.commons.net.ftp.FTPConnectionClosedException;
 import org.apache.ftpserver.FtpServer;
-import org.apache.ftpserver.listener.mina.MinaListener;
+import org.apache.ftpserver.listener.nio.NioListener;
 import org.apache.mina.filter.firewall.Subnet;
 
 public class SubnetBlacklistTest extends ClientTestTemplate {
     protected FtpServer createServer() throws Exception {
         FtpServer server = super.createServer();
         
-        MinaListener listener = (MinaListener) server.getServerContext().getListener("default");
+        NioListener listener = (NioListener) server.getServerContext().getListener("default");
         
         List<Subnet> blockedSubnets = new ArrayList<Subnet>();
         blockedSubnets.add(new Subnet(InetAddress.getByName("localhost"), 32));

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=667055&r1=667054&r2=667055&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 Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.config.spring;
 
 import java.net.InetAddress;
@@ -10,7 +29,7 @@
 import org.apache.ftpserver.FtpServer;
 import org.apache.ftpserver.command.HELP;
 import org.apache.ftpserver.listener.Listener;
-import org.apache.ftpserver.listener.mina.MinaListener;
+import org.apache.ftpserver.listener.nio.NioListener;
 import org.apache.mina.filter.firewall.Subnet;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
 import org.springframework.core.io.FileSystemResource;
@@ -28,13 +47,13 @@
         
         Listener listener = listeners.get("listener0");
         assertNotNull(listener);
-        assertTrue(listener instanceof MinaListener);
-        assertEquals(2222, ((MinaListener)listener).getPort());
-        assertEquals(true, ((MinaListener)listener).getDataConnectionConfiguration().isActiveEnabled());
-        assertEquals(InetAddress.getByName("1.2.3.4"), ((MinaListener)listener).getDataConnectionConfiguration().getActiveLocalAddress());
-        assertEquals("123-125", ((MinaListener)listener).getDataConnectionConfiguration().getPassivePorts());
+        assertTrue(listener instanceof NioListener);
+        assertEquals(2222, ((NioListener)listener).getPort());
+        assertEquals(true, ((NioListener)listener).getDataConnectionConfiguration().isActiveEnabled());
+        assertEquals(InetAddress.getByName("1.2.3.4"), ((NioListener)listener).getDataConnectionConfiguration().getActiveLocalAddress());
+        assertEquals("123-125", ((NioListener)listener).getDataConnectionConfiguration().getPassivePorts());
         
-        List<Subnet> subnets = ((MinaListener)listener).getBlockedSubnets();
+        List<Subnet> subnets = ((NioListener)listener).getBlockedSubnets();
         assertEquals(3, subnets.size());
         assertEquals(new Subnet(InetAddress.getByName("1.2.3.0"), 16), subnets.get(0));
         assertEquals(new Subnet(InetAddress.getByName("1.2.4.0"), 16), subnets.get(1));
@@ -42,13 +61,13 @@
         
         listener = listeners.get("listener1");
         assertNotNull(listener);
-        assertTrue(listener instanceof MinaListener);
-        assertEquals(2223, ((MinaListener)listener).getPort());
+        assertTrue(listener instanceof NioListener);
+        assertEquals(2223, ((NioListener)listener).getPort());
         
         listener = listeners.get("listener2");
         assertNotNull(listener);
-        assertTrue(listener instanceof MinaListener);
-        assertEquals(2224, ((MinaListener)listener).getPort());
+        assertTrue(listener instanceof NioListener);
+        assertEquals(2224, ((NioListener)listener).getPort());
         
         DefaultCommandFactory cf = (DefaultCommandFactory) server.getServerContext().getCommandFactory();
         assertEquals(1, cf.getCommandMap().size());

Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/TestFtplet.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/TestFtplet.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/TestFtplet.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/TestFtplet.java Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.config.spring;
 
 import org.apache.ftpserver.ftplet.DefaultFtplet;

Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileObjectTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileObjectTestTemplate.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileObjectTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileObjectTestTemplate.java Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.filesystem;
 
 

Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.filesystem;
 
 import junit.framework.TestCase;

Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java Thu Jun 12 04:56:13 2008
@@ -24,7 +24,7 @@
 import org.apache.commons.net.ftp.FTPSClient;
 import org.apache.ftpserver.DefaultFtpServerContext;
 import org.apache.ftpserver.FtpServer;
-import org.apache.ftpserver.listener.mina.MinaListener;
+import org.apache.ftpserver.listener.nio.NioListener;
 
 public class MinaCipherSuitesTest extends SSLTestTemplate {
 
@@ -39,7 +39,7 @@
     protected FtpServer createServer() throws Exception {
     	FtpServer server = super.createServer();
         DefaultFtpServerContext context = (DefaultFtpServerContext) server.getServerContext();
-        MinaListener listener = (MinaListener) context.getListener("default");
+        NioListener listener = (NioListener) context.getListener("default");
 
         DefaultSslConfiguration sslConfig = (DefaultSslConfiguration) listener.getSslConfiguration();
         sslConfig.setEnabledCipherSuites(new String[]{"SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA"});

Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java Thu Jun 12 04:56:13 2008
@@ -33,7 +33,7 @@
 import org.apache.ftpserver.DefaultFtpServerContext;
 import org.apache.ftpserver.FtpServer;
 import org.apache.ftpserver.clienttests.ClientTestTemplate;
-import org.apache.ftpserver.listener.mina.MinaListener;
+import org.apache.ftpserver.listener.nio.NioListener;
 import org.apache.ftpserver.test.TestUtil;
 import org.apache.ftpserver.util.IoUtils;
 
@@ -49,7 +49,7 @@
 
         FtpServer server = super.createServer();
         DefaultFtpServerContext context = (DefaultFtpServerContext) server.getServerContext();
-        MinaListener listener = (MinaListener) context.getListener("default");
+        NioListener listener = (NioListener) context.getListener("default");
         
         listener.setImplicitSsl(useImplicit());
         

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=667055&r1=667054&r2=667055&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 Thu Jun 12 04:56:13 2008
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License. -->  
+
 <beans:beans xmlns="http://mina.apache.org/ftpserver/spring/v1"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: mina/ftpserver/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/server/pom.xml?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/server/pom.xml (original)
+++ mina/ftpserver/trunk/server/pom.xml Thu Jun 12 04:56:13 2008
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License. -->  
+
 <project>
 	<parent>
 		<artifactId>ftpserver-parent</artifactId>

Modified: mina/ftpserver/trunk/server/src/test/java/org/apache/ftpserver/ConfigurableFtpServerContextTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/server/src/test/java/org/apache/ftpserver/ConfigurableFtpServerContextTest.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/server/src/test/java/org/apache/ftpserver/ConfigurableFtpServerContextTest.java (original)
+++ mina/ftpserver/trunk/server/src/test/java/org/apache/ftpserver/ConfigurableFtpServerContextTest.java Thu Jun 12 04:56:13 2008
@@ -27,25 +27,25 @@
 import org.apache.ftpserver.config.PropertiesConfiguration;
 import org.apache.ftpserver.ftplet.Configuration;
 import org.apache.ftpserver.listener.Listener;
-import org.apache.ftpserver.listener.mina.MinaListener;
+import org.apache.ftpserver.listener.nio.NioListener;
 
 
 public class ConfigurableFtpServerContextTest extends TestCase {
 
     public void testConfigListeners() throws Exception {
         Properties props = new Properties();
-        props.setProperty("config.listeners.foo1.class", MinaListener.class.getName());
-        props.setProperty("config.listeners.foo2.class", MinaListener.class.getName());
+        props.setProperty("config.listeners.foo1.class", NioListener.class.getName());
+        props.setProperty("config.listeners.foo2.class", NioListener.class.getName());
         
         Configuration config = new PropertiesConfiguration(props);
         
         ConfigurableFtpServerContext ctx = new ConfigurableFtpServerContext(config);
         
         assertNotNull(ctx.getListener("foo1"));
-        assertTrue(ctx.getListener("foo1") instanceof MinaListener);
+        assertTrue(ctx.getListener("foo1") instanceof NioListener);
 
         assertNotNull(ctx.getListener("foo2"));
-        assertTrue(ctx.getListener("foo2") instanceof MinaListener);
+        assertTrue(ctx.getListener("foo2") instanceof NioListener);
         
         Map<String, Listener> listeners = ctx.getListeners();
         

Modified: mina/ftpserver/trunk/server/src/test/java/org/apache/ftpserver/test/TestUtil.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/server/src/test/java/org/apache/ftpserver/test/TestUtil.java?rev=667055&r1=667054&r2=667055&view=diff
==============================================================================
--- mina/ftpserver/trunk/server/src/test/java/org/apache/ftpserver/test/TestUtil.java (original)
+++ mina/ftpserver/trunk/server/src/test/java/org/apache/ftpserver/test/TestUtil.java Thu Jun 12 04:56:13 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */  
+
 package org.apache.ftpserver.test;