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/07/12 22:55:26 UTC

svn commit: r676237 - in /mina/ftpserver/trunk/distribution/res/conf: README.txt ftpd-full.xml ftpd-typical.xml ftpd.properties ftpd.xml

Author: ngn
Date: Sat Jul 12 13:55:26 2008
New Revision: 676237

URL: http://svn.apache.org/viewvc?rev=676237&view=rev
Log:
Replacing the old config files with Spring based examples

Added:
    mina/ftpserver/trunk/distribution/res/conf/ftpd-full.xml   (with props)
    mina/ftpserver/trunk/distribution/res/conf/ftpd-typical.xml   (with props)
Removed:
    mina/ftpserver/trunk/distribution/res/conf/ftpd.properties
    mina/ftpserver/trunk/distribution/res/conf/ftpd.xml
Modified:
    mina/ftpserver/trunk/distribution/res/conf/README.txt

Modified: mina/ftpserver/trunk/distribution/res/conf/README.txt
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/res/conf/README.txt?rev=676237&r1=676236&r2=676237&view=diff
==============================================================================
--- mina/ftpserver/trunk/distribution/res/conf/README.txt (original)
+++ mina/ftpserver/trunk/distribution/res/conf/README.txt Sat Jul 12 13:55:26 2008
@@ -1,3 +1,3 @@
-You can find two sample configuration files here. One is a properties
-file based configuration file and the other is a XML file based 
-configuration file.
\ No newline at end of file
+You can find two sample configuration files here. One is a typical
+configuration file containing the common settings. The other is a full-fledged
+configuration file showing all available parameters.
\ No newline at end of file

Added: mina/ftpserver/trunk/distribution/res/conf/ftpd-full.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/res/conf/ftpd-full.xml?rev=676237&view=auto
==============================================================================
--- mina/ftpserver/trunk/distribution/res/conf/ftpd-full.xml (added)
+++ mina/ftpserver/trunk/distribution/res/conf/ftpd-full.xml Sat Jul 12 13:55:26 2008
@@ -0,0 +1,87 @@
+<?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.
+	-->
+<server 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"
+	xsi:schemaLocation="
+	   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd 
+	   http://mina.apache.org/ftpserver/spring/v1 http://mina.apache.org/ftpserver/ftpserver-1.0.xsd	
+	   "
+	id="myServer">
+	<!--
+		Use this section to define custom listeners, or to redefine the
+		default listener, aptly named "default"
+	-->
+	<!--
+		<listeners> <nio-listener name="default" port="2222"
+		implicit-ssl="true" idle-timeout="60" local-address="1.2.3.4"> <ssl>
+		<keystore file="mykeystore.jks" password="secret"
+		key-password="otherSecret" /> <truststore file="mytruststore.jks"
+		password="secret" /> </ssl> <data-connection idle-timeout="60">
+		<active enabled="true" local-address="1.2.3.4" local-port="2323"
+		ip-check="true" /> <passive ports="123-125" address="1.2.3.4"
+		external-address="1.2.3.4" /> </data-connection>
+		<blacklist>1.2.3.0/16, 1.2.4.0/16, 1.2.3.4</blacklist> </nio-listener>
+		</listeners>
+	-->
+	<!--
+		Use this section to define your Ftplets, they are configured like
+		regular Spring beans
+	-->
+	<!--
+		<ftplets> <ftplet name="ftplet1"> <beans:bean
+		class="org.apache.ftpserver.examples.MyFtplet"> <beans:property
+		name="foo" value="123" /> </beans:bean> </ftplet> </ftplets>
+	-->
+	<!-- The user manager, choose one -->
+	<!--
+		<file-user-manager file="users.properties" encrypt-passwords="true" />
+	<db-user-manager>
+		<data-source>
+			<beans:bean class="some.datasoure.class" />
+		</data-source>
+		<insert-user>INSERT INTO FTP_USER (uid, userpassword,
+			homedirectory, enableflag, writepermission, idletime, uploadrate,
+			downloadrate) VALUES ('{uid}', '{userpassword}', '{homedirectory}',
+			'{enableflag}', '{writepermission}', {idletime}, {uploadrate},
+			{downloadrate})</insert-user>
+		<update-user>UPDATE FTP_USER SET
+			userpassword='{userpassword}',homedirectory='{homedirectory}',enableflag='{enableflag}',writepermission='{writepermission}',idletime={idletime},uploadrate={uploadrate},downloadrate={downloadrate}
+			WHERE uid='{uid}'</update-user>
+		<delete-user>DELETE FROM FTP_USER WHERE uid = '{uid}'
+		</delete-user>
+		<select-user>SELECT uid, userpassword, homedirectory,
+			enableflag, writepermission, idletime, uploadrate, downloadrate FROM
+			FTP_USER WHERE uid = '{uid}'</select-user>
+		<select-all-users>SELECT uid FROM FTP_USER ORDER BY uid
+		</select-all-users>
+		<is-admin>SELECT uid FROM FTP_USER WHERE uid='{uid}' AND
+			uid='admin'</is-admin>
+		<authenticate>SELECT uid from FTP_USER WHERE uid='{uid}' AND
+			userpassword='{userpassword}'</authenticate>
+	</db-user-manager> -->
+	<!-- The file system -->
+	<!-- <native-filesystem case-insensitive="false"
+		create-home="true" />  -->
+	<!-- Use this section to define custom commands. 
+	     Custom commands can also override already existing commands -->
+	<!-- <commands use-default="false">
+		<command name="MYHELP">
+			<beans:bean class="org.apache.ftpserver.examples.MYHELP" />
+		</command>
+	</commands>  -->
+	<!-- Define the available languages -->
+	<!-- <messages languages="se, no ,da" /> -->
+</server>
\ No newline at end of file

Propchange: mina/ftpserver/trunk/distribution/res/conf/ftpd-full.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: mina/ftpserver/trunk/distribution/res/conf/ftpd-typical.xml
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution/res/conf/ftpd-typical.xml?rev=676237&view=auto
==============================================================================
--- mina/ftpserver/trunk/distribution/res/conf/ftpd-typical.xml (added)
+++ mina/ftpserver/trunk/distribution/res/conf/ftpd-typical.xml Sat Jul 12 13:55:26 2008
@@ -0,0 +1,30 @@
+<?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.
+	-->
+<server xmlns="http://mina.apache.org/ftpserver/spring/v1"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+	   http://mina.apache.org/ftpserver/spring/v1 http://mina.apache.org/ftpserver/ftpserver-1.0.xsd	
+	   "
+	id="myServer">
+	<listeners>
+		<nio-listener name="default" port="2121">
+			<ssl>
+				<keystore file="mykeystore.jks" password="secret" />
+			</ssl>
+		</nio-listener>
+	</listeners>
+	<file-user-manager file="users.properties" />
+</server>
\ No newline at end of file

Propchange: mina/ftpserver/trunk/distribution/res/conf/ftpd-typical.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain