billbarker 2004/06/27 19:14:52 Modified: webapps/admin admin.xml webapps/admin/WEB-INF struts-config.xml webapps/admin/WEB-INF/classes/org/apache/webapp/admin Lists.java TomcatTreeBuilder.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java ConnectorForm.java EditConnectorAction.java SaveConnectorAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context AddContextAction.java ContextForm.java EditContextAction.java SaveContextAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext AddDefaultContextAction.java DefaultContextForm.java EditDefaultContextAction.java SaveDefaultContextAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host AddHostAction.java EditHostAction.java HostForm.java SaveHostAction.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm AddRealmAction.java DataSourceRealmForm.java DeleteRealmAction.java EditRealmAction.java JDBCRealmForm.java JNDIRealmForm.java MemoryRealmForm.java RealmForm.java SaveDataSourceRealmAction.java SaveJDBCRealmAction.java SaveJNDIRealmAction.java SaveMemoryRealmAction.java SaveUserDatabaseRealmAction.java UserDatabaseRealmForm.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server EditServerAction.java SaveServerAction.java ServerForm.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service AddServiceAction.java EditServiceAction.java SaveServiceAction.java ServiceForm.java webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve AddValveAction.java EditValveAction.java RequestDumperValveForm.java SaveRequestDumperValveAction.java SaveSingleSignOnValveAction.java SingleSignOnValveForm.java ValveUtil.java webapps/admin/connector connector.jsp webapps/admin/context context.jsp webapps/admin/defaultcontext defaultcontext.jsp webapps/admin/host host.jsp webapps/admin/realm dataSourceRealm.jsp jdbcRealm.jsp jndiRealm.jsp memoryRealm.jsp userDatabaseRealm.jsp webapps/admin/server server.jsp webapps/admin/service service.jsp webapps/admin/valve accessLogValve.jsp requestDumperValve.jsp singleSignOnValve.jsp Removed: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger AddLoggerAction.java DeleteLoggerAction.java DeleteLoggersAction.java EditLoggerAction.java LoggerForm.java LoggersForm.java SaveLoggerAction.java webapps/admin/logger logger.jsp loggers.jsp Log: Removing 'Debug' and Loggers from the admin webapp. If Logging gets added, it will have to look a lot different than it does now. Revision Changes Path 1.4 +1 -5 jakarta-tomcat-catalina/webapps/admin/admin.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/admin.xml.diff?r1=1.3&r2=1.4 1.7 +0 -53 jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml.diff?r1=1.6&r2=1.7 1.14 +1 -72 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java.diff?r1=1.13&r2=1.14 1.12 +1 -39 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java.diff?r1=1.11&r2=1.12 1.9 +1 -3 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java.diff?r1=1.8&r2=1.9 1.11 +1 -49 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java.diff?r1=1.10&r2=1.11 1.11 +1 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java.diff?r1=1.10&r2=1.11 1.17 +1 -10 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java.diff?r1=1.16&r2=1.17 1.6 +1 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java.diff?r1=1.5&r2=1.6 1.6 +1 -104 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java.diff?r1=1.5&r2=1.6 1.8 +1 -11 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java.diff?r1=1.7&r2=1.8 1.14 +1 -29 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java.diff?r1=1.13&r2=1.14 1.7 +1 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/AddDefaultContextAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/AddDefaultContextAction.java.diff?r1=1.6&r2=1.7 1.4 +1 -77 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/DefaultContextForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/DefaultContextForm.java.diff?r1=1.3&r2=1.4 1.7 +1 -8 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/EditDefaultContextAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/EditDefaultContextAction.java.diff?r1=1.6&r2=1.7 1.10 +1 -20 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/SaveDefaultContextAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/SaveDefaultContextAction.java.diff?r1=1.9&r2=1.10 1.9 +1 -3 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java.diff?r1=1.8&r2=1.9 1.9 +2 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java.diff?r1=1.8&r2=1.9 1.10 +1 -52 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java.diff?r1=1.9&r2=1.10 1.10 +1 -11 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java.diff?r1=1.9&r2=1.10 1.9 +1 -11 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java.diff?r1=1.8&r2=1.9 1.3 +1 -3 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java.diff?r1=1.2&r2=1.3 1.3 +3 -3 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java.diff?r1=1.2&r2=1.3 1.8 +1 -21 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java.diff?r1=1.7&r2=1.8 1.4 +1 -3 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java.diff?r1=1.3&r2=1.4 1.6 +1 -3 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java.diff?r1=1.5&r2=1.6 1.4 +1 -3 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java.diff?r1=1.3&r2=1.4 1.5 +1 -48 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java.diff?r1=1.4&r2=1.5 1.2 +3 -13 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveDataSourceRealmAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveDataSourceRealmAction.java.diff?r1=1.1&r2=1.2 1.10 +3 -13 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java.diff?r1=1.9&r2=1.10 1.11 +3 -13 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java.diff?r1=1.10&r2=1.11 1.8 +3 -13 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java.diff?r1=1.7&r2=1.8 1.9 +3 -13 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java.diff?r1=1.8&r2=1.9 1.4 +1 -3 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java.diff?r1=1.3&r2=1.4 1.5 +1 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.java.diff?r1=1.4&r2=1.5 1.4 +1 -10 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java.diff?r1=1.3&r2=1.4 1.5 +1 -45 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java.diff?r1=1.4&r2=1.5 1.6 +1 -3 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java.diff?r1=1.5&r2=1.6 1.10 +1 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java.diff?r1=1.9&r2=1.10 1.15 +3 -15 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java.diff?r1=1.14&r2=1.15 1.5 +1 -48 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServiceForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServiceForm.java.diff?r1=1.4&r2=1.5 1.8 +1 -7 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java.diff?r1=1.7&r2=1.8 1.6 +1 -37 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java.diff?r1=1.5&r2=1.6 1.4 +1 -47 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RequestDumperValveForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RequestDumperValveForm.java.diff?r1=1.3&r2=1.4 1.7 +1 -26 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java.diff?r1=1.6&r2=1.7 1.7 +1 -26 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java.diff?r1=1.6&r2=1.7 1.3 +1 -50 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SingleSignOnValveForm.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SingleSignOnValveForm.java.diff?r1=1.2&r2=1.3 1.11 +34 -3 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java.diff?r1=1.10&r2=1.11 1.10 +0 -11 jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp.diff?r1=1.9&r2=1.10 1.6 +0 -42 jakarta-tomcat-catalina/webapps/admin/context/context.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/context/context.jsp.diff?r1=1.5&r2=1.6 1.4 +0 -22 jakarta-tomcat-catalina/webapps/admin/defaultcontext/defaultcontext.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/defaultcontext/defaultcontext.jsp.diff?r1=1.3&r2=1.4 1.12 +0 -20 jakarta-tomcat-catalina/webapps/admin/host/host.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/host/host.jsp.diff?r1=1.11&r2=1.12 1.3 +0 -11 jakarta-tomcat-catalina/webapps/admin/realm/dataSourceRealm.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/realm/dataSourceRealm.jsp.diff?r1=1.2&r2=1.3 1.5 +0 -12 jakarta-tomcat-catalina/webapps/admin/realm/jdbcRealm.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/realm/jdbcRealm.jsp.diff?r1=1.4&r2=1.5 1.5 +0 -11 jakarta-tomcat-catalina/webapps/admin/realm/jndiRealm.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/realm/jndiRealm.jsp.diff?r1=1.4&r2=1.5 1.4 +0 -11 jakarta-tomcat-catalina/webapps/admin/realm/memoryRealm.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/realm/memoryRealm.jsp.diff?r1=1.3&r2=1.4 1.5 +0 -11 jakarta-tomcat-catalina/webapps/admin/realm/userDatabaseRealm.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/realm/userDatabaseRealm.jsp.diff?r1=1.4&r2=1.5 1.6 +0 -11 jakarta-tomcat-catalina/webapps/admin/server/server.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/server/server.jsp.diff?r1=1.5&r2=1.6 1.13 +0 -22 jakarta-tomcat-catalina/webapps/admin/service/service.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/service/service.jsp.diff?r1=1.12&r2=1.13 1.5 +0 -11 jakarta-tomcat-catalina/webapps/admin/valve/accessLogValve.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/valve/accessLogValve.jsp.diff?r1=1.4&r2=1.5 1.5 +0 -11 jakarta-tomcat-catalina/webapps/admin/valve/requestDumperValve.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/valve/requestDumperValve.jsp.diff?r1=1.4&r2=1.5 1.4 +0 -11 jakarta-tomcat-catalina/webapps/admin/valve/singleSignOnValve.jsp http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/webapps/admin/valve/singleSignOnValve.jsp.diff?r1=1.3&r2=1.4
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]