You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/07/06 15:23:26 UTC
svn commit: r419579 [1/5] - in /incubator/lokahi/lokahi/trunk: conf/
src/java/org/apache/lokahi/core/agent/dao/
src/java/org/apache/lokahi/core/agent/jmx/
src/java/org/apache/lokahi/core/agent/runnable/
src/java/org/apache/lokahi/core/agent/tomcat/ src...
Author: toback
Date: Thu Jul 6 08:23:21 2006
New Revision: 419579
URL: http://svn.apache.org/viewvc?rev=419579&view=rev
Log:
Formatting, optimized imports.
Modified:
incubator/lokahi/lokahi/trunk/conf/agent.log4j.xml
incubator/lokahi/lokahi/trunk/conf/agent.wsdd
incubator/lokahi/lokahi/trunk/conf/agent.xml
incubator/lokahi/lokahi/trunk/conf/derby.xml
incubator/lokahi/lokahi/trunk/conf/function.xml
incubator/lokahi/lokahi/trunk/conf/log4j.xml
incubator/lokahi/lokahi/trunk/conf/oracle.xml
incubator/lokahi/lokahi/trunk/conf/server-config.wsdd
incubator/lokahi/lokahi/trunk/conf/state.xml
incubator/lokahi/lokahi/trunk/conf/toolbox.xml
incubator/lokahi/lokahi/trunk/conf/validation.xml
incubator/lokahi/lokahi/trunk/conf/validator-rules-1_1.xml
incubator/lokahi/lokahi/trunk/conf/validator-rules.xml
incubator/lokahi/lokahi/trunk/conf/web.xml
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/ProcessMonitor.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXConnect.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXTomcat.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXVirtualMachine.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/Watchdog.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/tomcat/HttpTomcat.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/ProcessFactory.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertDAO.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertTool.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/environment/Environment.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/File.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/instance/Instance.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/ipaddress/Ip.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/job/Job.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/jobpool/JobPool.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/pool/HostingPool.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/pool/HostingPoolModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/project/Project.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/Hardware.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/HardwareModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/state/StateModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/user/User.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authentication/AuthenticationFactory.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authentication/DatabaseAuthentication.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authorization/AuthorizationManager.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/TMCCollectionImpl.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/BrokerFactory.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/DerbyBroker.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/OracleBroker.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/XMLBroker.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/GenericDatabaseBroker.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/WapTool.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/CheckJobPoolTask.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/PingPong.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/SendJobTask.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemTool.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/AlertAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/Authorization.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/EnvironmentAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/FileAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HardwareAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/InstanceAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/ProjectAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/RestServlet.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCRSSAlertServlet.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TemplateAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/UserAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHost.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/AMPoolWorker.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePool.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePoolModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorker.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/VirtualHostAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContext.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TMPoolWorker.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TomcatPool.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TomcatPoolModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/server/Tomcat.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/ServerXmlFile.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/TomcatWorker.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/ContextAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatAction.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatPoolAction.java
incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/global.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/indiv.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/global.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/indiv.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/list.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/global.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/indiv.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/confirm.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/details.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/update.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm
incubator/lokahi/lokahi/trunk/src/www/layout/header.vm
incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm
incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm
Modified: incubator/lokahi/lokahi/trunk/conf/agent.log4j.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/agent.log4j.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/agent.log4j.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/agent.log4j.xml Thu Jul 6 08:23:21 2006
@@ -2,12 +2,12 @@
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-<!-- <appender name="console" class="org.apache.log4j.ConsoleAppender">-->
-<!-- <param name="Target" value="System.Out"/>-->
-<!-- <layout class="org.apache.log4j.PatternLayout">-->
-<!-- <param name="ConversionPattern" value="[%d{MM/dd/yyyy HH:mm:ss.SSS}] [%-5p] [%F:%L] [%C::%M] %m%n"/>-->
-<!-- </layout>-->
-<!-- </appender>-->
+ <!-- <appender name="console" class="org.apache.log4j.ConsoleAppender">-->
+ <!-- <param name="Target" value="System.Out"/>-->
+ <!-- <layout class="org.apache.log4j.PatternLayout">-->
+ <!-- <param name="ConversionPattern" value="[%d{MM/dd/yyyy HH:mm:ss.SSS}] [%-5p] [%F:%L] [%C::%M] %m%n"/>-->
+ <!-- </layout>-->
+ <!-- </appender>-->
<appender name="file" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="@AGENT_LOG_LOCATION@"/>
@@ -35,7 +35,7 @@
<root>
<priority value="DEBUG"/>
-<!-- <appender-ref ref="console"/>-->
+ <!-- <appender-ref ref="console"/>-->
<appender-ref ref="file"/>
</root>
Modified: incubator/lokahi/lokahi/trunk/conf/agent.wsdd
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/agent.wsdd?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/agent.wsdd (original)
+++ incubator/lokahi/lokahi/trunk/conf/agent.wsdd Thu Jul 6 08:23:21 2006
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="http://xml.apache.org/axis/wsdd/"
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
- <service name="JobHandler" provider="java:RPC">
- <parameter name="className" value="org.apache.lokahi.core.agent.JobSOAP"/>
- <parameter name="allowedMethods" value="scheduleJob"/>
- </service>
+ <service name="JobHandler" provider="java:RPC">
+ <parameter name="className" value="org.apache.lokahi.core.agent.JobSOAP"/>
+ <parameter name="allowedMethods" value="scheduleJob"/>
+ </service>
</deployment>
Modified: incubator/lokahi/lokahi/trunk/conf/agent.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/agent.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/agent.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/agent.xml Thu Jul 6 08:23:21 2006
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- $Id$ -->
+<!-- $Id$ -->
<!DOCTYPE database [
- <!ELEMENT database (table)>
- <!ELEMENT table (column)>
- <!ELEMENT column (EMPTY)>
+ <!ELEMENT database (table)>
+ <!ELEMENT table (column)>
+ <!ELEMENT column (EMPTY)>
<!ATTLIST database version id #REQUIRED>
<!ATTLIST database type id #REQUIRED>
<!ATTLIST table name id #REQUIRED>
@@ -12,7 +12,7 @@
<!ATTLIST column null (true|false) #REQUIRED>
<!ATTLIST column pk (true|false) "false">
<!ATTLIST column size CDATA "0">
-]>
+ ]>
<database type="AgentDerby" version="0.6.0">
<table name="TMC_JOB">
<column name="pk" type="INTEGER" null="false" pk="true"/>
Modified: incubator/lokahi/lokahi/trunk/conf/derby.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/derby.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/derby.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/derby.xml Thu Jul 6 08:23:21 2006
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- $Id$ -->
+<!-- $Id$ -->
<!DOCTYPE database [
- <!ELEMENT database (table)>
- <!ELEMENT table (column)>
- <!ELEMENT column (EMPTY)>
+ <!ELEMENT database (table)>
+ <!ELEMENT table (column)>
+ <!ELEMENT column (EMPTY)>
<!ATTLIST database version id #REQUIRED>
<!ATTLIST database type id #REQUIRED>
<!ATTLIST table name id #REQUIRED>
@@ -12,10 +12,10 @@
<!ATTLIST column null (true|false) #REQUIRED>
<!ATTLIST column pk (true|false) "false">
<!ATTLIST column size CDATA "0">
-]>
+ ]>
<database type="derby" version="0.6.0">
<table name="AM_CONTAINER">
- <column name="CONTAINER_ID" type="INTEGER" size="0" null="false" pk="true" />
+ <column name="CONTAINER_ID" type="INTEGER" size="0" null="false" pk="true"/>
<column name="CONTAINER_NAME" type="VARCHAR" size="100" null="false"/>
<column name="SERVER_ROOT" type="VARCHAR" size="300" null="true"/>
<column name="LOG_LOCATION" type="VARCHAR" size="300" null="true"/>
@@ -67,16 +67,16 @@
<column name="HARDWARE_ID" type="INTEGER" size="0" null="false"/>
<column name="CONTAINER_ID" type="INTEGER" size="0" null="false"/>
</table>
-<!-- <table name="TMC_ADMIN">-->
-<!-- <column name="LOCK_USERS" type="INTEGER" size="0" null="true"/>-->
-<!-- <column name="PRIMARY_JVM" type="VARCHAR" size="60" null="true"/>-->
-<!-- <column name="BACKUP_JVM" type="VARCHAR" size="60" null="true"/>-->
-<!-- <column name="ALTERNATE_JVM" type="VARCHAR" size="2000" null="true"/>-->
-<!-- <column name="OLD_KEY" type="VARCHAR" size="30" null="true"/>-->
-<!-- <column name="CURRENT_KEY" type="VARCHAR" size="30" null="true"/>-->
-<!-- <column name="KEY_LAST_ROTATED" type="DATE" size="0" null="true"/>-->
-<!-- <column name="INSTANCE_ID" type="INTEGER" size="0" null="true"/>-->
-<!-- </table>-->
+ <!-- <table name="TMC_ADMIN">-->
+ <!-- <column name="LOCK_USERS" type="INTEGER" size="0" null="true"/>-->
+ <!-- <column name="PRIMARY_JVM" type="VARCHAR" size="60" null="true"/>-->
+ <!-- <column name="BACKUP_JVM" type="VARCHAR" size="60" null="true"/>-->
+ <!-- <column name="ALTERNATE_JVM" type="VARCHAR" size="2000" null="true"/>-->
+ <!-- <column name="OLD_KEY" type="VARCHAR" size="30" null="true"/>-->
+ <!-- <column name="CURRENT_KEY" type="VARCHAR" size="30" null="true"/>-->
+ <!-- <column name="KEY_LAST_ROTATED" type="DATE" size="0" null="true"/>-->
+ <!-- <column name="INSTANCE_ID" type="INTEGER" size="0" null="true"/>-->
+ <!-- </table>-->
<table name="TMC_ALERTS">
<column name="ALERT_ID" type="INTEGER" size="0" null="false"/>
<column name="ALERT_CONTENTS" type="BLOB" size="0" null="true"/>
@@ -105,7 +105,7 @@
<column name="FUNCTION_ID" type="INTEGER" size="0" null="false"/>
<column name="FUNCTION_NAME" type="VARCHAR" size="50" null="false"/>
<column name="FUNCTION_COMMAND" type="VARCHAR" size="50" null="true"/>
-<!-- <column name="MODULE_ID" type="INTEGER" size="0" null="true"/>-->
+ <!-- <column name="MODULE_ID" type="INTEGER" size="0" null="true"/>-->
</table>
<table name="TMC_HARDWARE">
<column name="HARDWARE_NAME" type="VARCHAR" size="60" null="false"/>
@@ -141,31 +141,31 @@
<column name="IP" type="VARCHAR" size="15" null="false"/>
<column name="IP_ID" type="INTEGER" size="0" null="false"/>
</table>
-<!-- <table name="TMC_JOB">-->
-<!-- <column name="JOB_ID" type="INTEGER" size="0" null="false"/>-->
-<!-- <column name="POOL_ID" type="INTEGER" size="0" null="false"/>-->
-<!-- <column name="JOB_NAME" type="VARCHAR" size="400" null="true"/>-->
-<!-- <column name="SERVER_ID" type="INTEGER" size="0" null="false"/>-->
-<!-- <column name="PARENT_ID" type="INTEGER" size="0" null="true"/>-->
-<!-- <column name="START_TIME" type="DATE" size="0" null="true"/>-->
-<!-- <column name="FINISH_TIME" type="DATE" size="0" null="true"/>-->
-<!-- <column name="STATE_ID" type="INTEGER" size="0" null="true"/>-->
-<!-- <column name="OPTIONS" type="VARCHAR" size="4000" null="true"/>-->
-<!-- <column name="INSTANCE_ID" type="INTEGER" size="0" null="false"/>-->
-<!-- <column name="FUNCTION_ID" type="INTEGER" size="0" null="false"/>-->
-<!-- <column name="RESULT" type="BLOB" size="0" null="true"/>-->
-<!-- </table>-->
-<!-- <table name="TMC_JOB_POOL">-->
-<!-- <column name="JOB_POOL_ID" type="INTEGER" size="0" null="false"/>-->
-<!-- <column name="JOB_POOL_NAME" type="VARCHAR" size="400" null="true"/>-->
-<!-- <column name="PROJECT_ID" type="INTEGER" size="0" null="true"/>-->
-<!-- <column name="USER_ID" type="INTEGER" size="0" null="true"/>-->
-<!-- <column name="START_TIME" type="DATE" size="0" null="true"/>-->
-<!-- <column name="FINISH_TIME" type="DATE" size="0" null="true"/>-->
-<!-- <column name="STATE_ID" type="INTEGER" size="0" null="true"/>-->
-<!-- <column name="FUNCTION_ID" type="INTEGER" size="0" null="false"/>-->
-<!-- <column name="OPTIONS" type="VARCHAR" size="4000" null="true"/>-->
-<!-- </table>-->
+ <!-- <table name="TMC_JOB">-->
+ <!-- <column name="JOB_ID" type="INTEGER" size="0" null="false"/>-->
+ <!-- <column name="POOL_ID" type="INTEGER" size="0" null="false"/>-->
+ <!-- <column name="JOB_NAME" type="VARCHAR" size="400" null="true"/>-->
+ <!-- <column name="SERVER_ID" type="INTEGER" size="0" null="false"/>-->
+ <!-- <column name="PARENT_ID" type="INTEGER" size="0" null="true"/>-->
+ <!-- <column name="START_TIME" type="DATE" size="0" null="true"/>-->
+ <!-- <column name="FINISH_TIME" type="DATE" size="0" null="true"/>-->
+ <!-- <column name="STATE_ID" type="INTEGER" size="0" null="true"/>-->
+ <!-- <column name="OPTIONS" type="VARCHAR" size="4000" null="true"/>-->
+ <!-- <column name="INSTANCE_ID" type="INTEGER" size="0" null="false"/>-->
+ <!-- <column name="FUNCTION_ID" type="INTEGER" size="0" null="false"/>-->
+ <!-- <column name="RESULT" type="BLOB" size="0" null="true"/>-->
+ <!-- </table>-->
+ <!-- <table name="TMC_JOB_POOL">-->
+ <!-- <column name="JOB_POOL_ID" type="INTEGER" size="0" null="false"/>-->
+ <!-- <column name="JOB_POOL_NAME" type="VARCHAR" size="400" null="true"/>-->
+ <!-- <column name="PROJECT_ID" type="INTEGER" size="0" null="true"/>-->
+ <!-- <column name="USER_ID" type="INTEGER" size="0" null="true"/>-->
+ <!-- <column name="START_TIME" type="DATE" size="0" null="true"/>-->
+ <!-- <column name="FINISH_TIME" type="DATE" size="0" null="true"/>-->
+ <!-- <column name="STATE_ID" type="INTEGER" size="0" null="true"/>-->
+ <!-- <column name="FUNCTION_ID" type="INTEGER" size="0" null="false"/>-->
+ <!-- <column name="OPTIONS" type="VARCHAR" size="4000" null="true"/>-->
+ <!-- </table>-->
<table name="TMC_KEYWORD">
<column name="KEYWORD_ID" type="INTEGER" size="0" null="false"/>
<column name="KEYWORD_NAME" type="VARCHAR" size="50" null="false"/>
Modified: incubator/lokahi/lokahi/trunk/conf/function.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/function.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/function.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/function.xml Thu Jul 6 08:23:21 2006
@@ -1,132 +1,132 @@
<?xml version="1.0" encoding="UTF-8"?>
<functions>
-<function id="8" name="Update Virtualhost" command="UpdateVirtualHost" />
-<function id="123" name="Delete Alert" command="DeleteAlert" />
-<function id="64" name="Add Environment" command="AddEnvironment" />
-<function id="38" name="Update Tomcat" command="UpdateTomcat" />
-<function id="61" name="View TomcatPool" command="ViewTomcatPool" />
-<function id="120" name="View Alert" command="ViewAlert" />
-<function id="97" name="Update Apache" command="UpdateApache" />
-<function id="69" name="Update Instance" command="UpdateInstance" />
-<function id="29" name="View Apache Worker" command="ViewApacheWorker" />
-<function id="87" name="Start Tomcat" command="StartTomcat" />
-<function id="36" name="Add Tomcat" command="AddTomcat" />
-<function id="32" name="Add Project" command="AddProject" />
-<function id="28" name="Add Apache Worker" command="AddApacheWorker" />
-<function id="74" name="Delete Function" command="DeleteFunction" />
-<function id="90" name="Update Tomcat" command="UpdateTomcat" />
-<function id="119" name="Deploy Tomcat Config" command="DeployTomcatConfig" />
-<function id="18" name="Delete Hardware" command="DeleteHardware" />
-<function id="34" name="Delete Project" command="DeleteProject" />
- <function id="10" name="View Context" command="ViewContext" />
- <function id="3" name="Update Context" command="UpdateContext" />
- <function id="1" name="Delete Context" command="DeleteContext" />
+ <function id="8" name="Update Virtualhost" command="UpdateVirtualHost"/>
+ <function id="123" name="Delete Alert" command="DeleteAlert"/>
+ <function id="64" name="Add Environment" command="AddEnvironment"/>
+ <function id="38" name="Update Tomcat" command="UpdateTomcat"/>
+ <function id="61" name="View TomcatPool" command="ViewTomcatPool"/>
+ <function id="120" name="View Alert" command="ViewAlert"/>
+ <function id="97" name="Update Apache" command="UpdateApache"/>
+ <function id="69" name="Update Instance" command="UpdateInstance"/>
+ <function id="29" name="View Apache Worker" command="ViewApacheWorker"/>
+ <function id="87" name="Start Tomcat" command="StartTomcat"/>
+ <function id="36" name="Add Tomcat" command="AddTomcat"/>
+ <function id="32" name="Add Project" command="AddProject"/>
+ <function id="28" name="Add Apache Worker" command="AddApacheWorker"/>
+ <function id="74" name="Delete Function" command="DeleteFunction"/>
+ <function id="90" name="Update Tomcat" command="UpdateTomcat"/>
+ <function id="119" name="Deploy Tomcat Config" command="DeployTomcatConfig"/>
+ <function id="18" name="Delete Hardware" command="DeleteHardware"/>
+ <function id="34" name="Delete Project" command="DeleteProject"/>
+ <function id="10" name="View Context" command="ViewContext"/>
+ <function id="3" name="Update Context" command="UpdateContext"/>
+ <function id="1" name="Delete Context" command="DeleteContext"/>
- <function id="76" name="Reload Context" command="ReloadContext" />
- <function id="77" name="Stop Context" command="StopContext" />
- <function id="78" name="Start Context" command="StartContext" />
- <function id="79" name="Undeploy Context" command="UndeployContext" />
- <function id="80" name="Redeploy Context" command="RedeployContext" />
- <function id="81" name="Install Context" command="InstallContext" />
- <function id="82" name="List Context" command="ListContext" />
- <function id="84" name="List Sessions" command="SessionsOfContext" />
- <function id="85" name="Status of Context" command="StatusOfContext" />
+ <function id="76" name="Reload Context" command="ReloadContext"/>
+ <function id="77" name="Stop Context" command="StopContext"/>
+ <function id="78" name="Start Context" command="StartContext"/>
+ <function id="79" name="Undeploy Context" command="UndeployContext"/>
+ <function id="80" name="Redeploy Context" command="RedeployContext"/>
+ <function id="81" name="Install Context" command="InstallContext"/>
+ <function id="82" name="List Context" command="ListContext"/>
+ <function id="84" name="List Sessions" command="SessionsOfContext"/>
+ <function id="85" name="Status of Context" command="StatusOfContext"/>
- <function id="127" name="Reload Context" command="ReloadContext6" />
- <function id="128" name="Stop Context" command="StopContext6" />
- <function id="129" name="Start Context" command="StartContext6" />
- <function id="130" name="Undeploy Context" command="UndeployContext6" />
- <function id="131" name="Redeploy Context" command="RedeployContext6" />
- <function id="132" name="Install Context" command="InstallContext6" />
- <function id="133" name="List Context" command="ListContext6" />
- <function id="134" name="List Sessions" command="SessionsOfContext6" />
- <function id="135" name="Status of Context" command="StatusOfContext6" />
+ <function id="127" name="Reload Context" command="ReloadContext6"/>
+ <function id="128" name="Stop Context" command="StopContext6"/>
+ <function id="129" name="Start Context" command="StartContext6"/>
+ <function id="130" name="Undeploy Context" command="UndeployContext6"/>
+ <function id="131" name="Redeploy Context" command="RedeployContext6"/>
+ <function id="132" name="Install Context" command="InstallContext6"/>
+ <function id="133" name="List Context" command="ListContext6"/>
+ <function id="134" name="List Sessions" command="SessionsOfContext6"/>
+ <function id="135" name="Status of Context" command="StatusOfContext6"/>
-<function id="121" name="Update Alert" command="UpdateAlert" />
-<function id="125" name="Delete VirtualHost" command="DeleteVirtualHost" />
-<function id="48" name="Add HostingPool" command="AddHostingPool" />
-<function id="37" name="View Tomcat" command="ViewTomcat" />
-<function id="107" name="View Environment" command="ViewEnvironment" />
-<function id="47" name="Delete Tomcat Worker" command="DeleteTomcatWorker" />
-<function id="4" name="Add Virtualhost" command="AddVirtualHost" />
-<function id="58" name="Update ApachePool" command="UpdateApachePool" />
-<function id="91" name="Stop Apache" command="StopApache" />
-<function id="99" name="Get File" command="GetFile" />
-<function id="19" name="Move Hardware" command="MoveHardware" />
-<function id="100" name="Tail File" command="TailFile" />
-<function id="45" name="View Tomcat Worker" command="ViewTomcatWorker" />
-<function id="50" name="Update HostingPool" command="UpdateHostingPool" />
-<function id="83" name="Monitor Managment Context" command="MonitorTMAgent" />
-<function id="96" name="Status of Apache" command="StatusOfApache" />
-<function id="63" name="Delete TomcatPool" command="DeleteTomcatPool" />
-<function id="94" name="Configtest Apache" command="ConfigtestApache" />
-<function id="49" name="View HostingPool" command="ViewHostingPool" />
-<function id="105" name="Add Url Monitor to Guardian" command="AddUrlMonitor" />
-<function id="31" name="Update Apache Worker" command="UpdateApacheWorker" />
-<function id="115" name="Add an Alert" command="AddAlert" />
-<function id="102" name="List Directory" command="ListDir" />
-<function id="2" name="Move Context" command="MoveContext" />
-<function id="7" name="Delete Virtualhost" command="DeleteVirtualHost" />
-<function id="62" name="Update TomcatPool" command="UpdateTomcatPool" />
-<function id="68" name="Delete Instance" command="DeleteInstance" />
-<function id="112" name="Add Internet Project" command="AddInternetProject" />
-<function id="109" name="View State" command="ViewState" />
-<function id="15" name="Add Hardware" command="AddHardware" />
-<function id="17" name="Update Hardware" command="UpdateHardware" />
-<function id="25" name="View Apache" command="ViewApache" />
-<function id="30" name="Delete Apache Worker" command="DeleteApacheWorker" />
-<function id="59" name="Delete ApachePool" command="DeleteApachePool" />
-<function id="65" name="Delete Environment" command="DeleteEnvironment" />
-<function id="86" name="Stop Tomcat" command="StopTomcat" />
-<function id="9" name="Add Context" command="AddContext" />
-<function id="11" name="Add User" command="AddUser" />
-<function id="14" name="Delete User" command="DeleteUser" />
-<function id="95" name="Graceful Apache" command="GracefulApache" />
-<function id="101" name="Make Directory" command="MakeDir" />
-<function id="46" name="Update Tomcat Worker" command="UpdateTomcatWorker" />
-<function id="33" name="View Project" command="ViewProject" />
-<function id="21" name="View IP" command="ViewIp" />
-<function id="44" name="Add Tomcat Worker" command="AddTomcatWorker" />
-<function id="108" name="View Instance" command="ViewInstance" />
-<function id="110" name="View Function" command="ViewFunction" />
-<function id="104" name="Status of Agent" command="StatusOfAgent" />
-<function id="22" name="Delete IP" command="DeleteIp" />
-<function id="56" name="Add ApachePool" command="AddApachePool" />
-<function id="5" name="View Virtualhost" command="ViewVirtualHost" />
-<function id="98" name="Push File" command="PutFile" />
-<function id="26" name="Delete Apache" command="DeleteApache" />
-<function id="75" name="Update Function" command="UpdateFunction" />
-<function id="92" name="Start Apache" command="StartApache" />
-<function id="35" name="Update Project" command="UpdateProject" />
-<function id="51" name="Delete HostingPool" command="DeleteHostingPool" />
-<function id="126" name="Remove from Vhost" command="RemoveContextFromVhost" />
-<function id="60" name="Add TomcatPool" command="AddTomcatPool" />
-<function id="6" name="Move Virtualhost" command="MoveVirtualHost" />
-<function id="13" name="Update User" command="UpdateUser" />
-<function id="12" name="View User" command="ViewUser" />
-<function id="16" name="View Hardware" command="ViewHardware" />
-<function id="20" name="Add IP" command="AddIp" />
-<function id="103" name="Graceful Agent" command="GracefulAgent" />
-<function id="111" name="Add User To Project" command="AddUserToProject" />
-<function id="27" name="Update Apache" command="UpdateApache" />
-<function id="118" name="Deploy Apache Config" command="DeployApacheConfig" />
-<function id="88" name="Restart Tomcat" command="RestartTomcat" />
-<function id="23" name="Update IP" command="UpdateIp" />
-<function id="117" name="Add Help Entry" command="AddHelpItem" />
-<function id="136" name="Delete Help Entry" command="DeleteHelpItem" />
-<function id="42" name="Update File" command="UpdateFile" />
-<function id="39" name="Delete Tomcat" command="DeleteTomcat" />
-<function id="67" name="Add Instance" command="AddInstance" />
-<function id="89" name="Status of Tomcat" command="StatusOfTomcat" />
-<function id="41" name="View File" command="ViewFile" />
-<function id="106" name="Add Process to Guardian" command="AddProccess" />
-<function id="66" name="Update Environment" command="UpdateEnvironment" />
-<function id="24" name="Add Apache" command="AddApache" />
-<function id="57" name="View ApachePool" command="ViewApachePool" />
-<function id="116" name="Update Help Entry" command="UpdateHelpItem" />
-<function id="114" name="Add VirtualHost To Project" command="AddVirtualHostToProject" />
-<function id="93" name="Restart Apache" command="RestartApache" />
-<function id="73" name="Add Function" command="AddFunction" />
-<function id="43" name="Delete File" command="DeleteFile" />
-<function id="40" name="Add File" command="AddFile" />
+ <function id="121" name="Update Alert" command="UpdateAlert"/>
+ <function id="125" name="Delete VirtualHost" command="DeleteVirtualHost"/>
+ <function id="48" name="Add HostingPool" command="AddHostingPool"/>
+ <function id="37" name="View Tomcat" command="ViewTomcat"/>
+ <function id="107" name="View Environment" command="ViewEnvironment"/>
+ <function id="47" name="Delete Tomcat Worker" command="DeleteTomcatWorker"/>
+ <function id="4" name="Add Virtualhost" command="AddVirtualHost"/>
+ <function id="58" name="Update ApachePool" command="UpdateApachePool"/>
+ <function id="91" name="Stop Apache" command="StopApache"/>
+ <function id="99" name="Get File" command="GetFile"/>
+ <function id="19" name="Move Hardware" command="MoveHardware"/>
+ <function id="100" name="Tail File" command="TailFile"/>
+ <function id="45" name="View Tomcat Worker" command="ViewTomcatWorker"/>
+ <function id="50" name="Update HostingPool" command="UpdateHostingPool"/>
+ <function id="83" name="Monitor Managment Context" command="MonitorTMAgent"/>
+ <function id="96" name="Status of Apache" command="StatusOfApache"/>
+ <function id="63" name="Delete TomcatPool" command="DeleteTomcatPool"/>
+ <function id="94" name="Configtest Apache" command="ConfigtestApache"/>
+ <function id="49" name="View HostingPool" command="ViewHostingPool"/>
+ <function id="105" name="Add Url Monitor to Guardian" command="AddUrlMonitor"/>
+ <function id="31" name="Update Apache Worker" command="UpdateApacheWorker"/>
+ <function id="115" name="Add an Alert" command="AddAlert"/>
+ <function id="102" name="List Directory" command="ListDir"/>
+ <function id="2" name="Move Context" command="MoveContext"/>
+ <function id="7" name="Delete Virtualhost" command="DeleteVirtualHost"/>
+ <function id="62" name="Update TomcatPool" command="UpdateTomcatPool"/>
+ <function id="68" name="Delete Instance" command="DeleteInstance"/>
+ <function id="112" name="Add Internet Project" command="AddInternetProject"/>
+ <function id="109" name="View State" command="ViewState"/>
+ <function id="15" name="Add Hardware" command="AddHardware"/>
+ <function id="17" name="Update Hardware" command="UpdateHardware"/>
+ <function id="25" name="View Apache" command="ViewApache"/>
+ <function id="30" name="Delete Apache Worker" command="DeleteApacheWorker"/>
+ <function id="59" name="Delete ApachePool" command="DeleteApachePool"/>
+ <function id="65" name="Delete Environment" command="DeleteEnvironment"/>
+ <function id="86" name="Stop Tomcat" command="StopTomcat"/>
+ <function id="9" name="Add Context" command="AddContext"/>
+ <function id="11" name="Add User" command="AddUser"/>
+ <function id="14" name="Delete User" command="DeleteUser"/>
+ <function id="95" name="Graceful Apache" command="GracefulApache"/>
+ <function id="101" name="Make Directory" command="MakeDir"/>
+ <function id="46" name="Update Tomcat Worker" command="UpdateTomcatWorker"/>
+ <function id="33" name="View Project" command="ViewProject"/>
+ <function id="21" name="View IP" command="ViewIp"/>
+ <function id="44" name="Add Tomcat Worker" command="AddTomcatWorker"/>
+ <function id="108" name="View Instance" command="ViewInstance"/>
+ <function id="110" name="View Function" command="ViewFunction"/>
+ <function id="104" name="Status of Agent" command="StatusOfAgent"/>
+ <function id="22" name="Delete IP" command="DeleteIp"/>
+ <function id="56" name="Add ApachePool" command="AddApachePool"/>
+ <function id="5" name="View Virtualhost" command="ViewVirtualHost"/>
+ <function id="98" name="Push File" command="PutFile"/>
+ <function id="26" name="Delete Apache" command="DeleteApache"/>
+ <function id="75" name="Update Function" command="UpdateFunction"/>
+ <function id="92" name="Start Apache" command="StartApache"/>
+ <function id="35" name="Update Project" command="UpdateProject"/>
+ <function id="51" name="Delete HostingPool" command="DeleteHostingPool"/>
+ <function id="126" name="Remove from Vhost" command="RemoveContextFromVhost"/>
+ <function id="60" name="Add TomcatPool" command="AddTomcatPool"/>
+ <function id="6" name="Move Virtualhost" command="MoveVirtualHost"/>
+ <function id="13" name="Update User" command="UpdateUser"/>
+ <function id="12" name="View User" command="ViewUser"/>
+ <function id="16" name="View Hardware" command="ViewHardware"/>
+ <function id="20" name="Add IP" command="AddIp"/>
+ <function id="103" name="Graceful Agent" command="GracefulAgent"/>
+ <function id="111" name="Add User To Project" command="AddUserToProject"/>
+ <function id="27" name="Update Apache" command="UpdateApache"/>
+ <function id="118" name="Deploy Apache Config" command="DeployApacheConfig"/>
+ <function id="88" name="Restart Tomcat" command="RestartTomcat"/>
+ <function id="23" name="Update IP" command="UpdateIp"/>
+ <function id="117" name="Add Help Entry" command="AddHelpItem"/>
+ <function id="136" name="Delete Help Entry" command="DeleteHelpItem"/>
+ <function id="42" name="Update File" command="UpdateFile"/>
+ <function id="39" name="Delete Tomcat" command="DeleteTomcat"/>
+ <function id="67" name="Add Instance" command="AddInstance"/>
+ <function id="89" name="Status of Tomcat" command="StatusOfTomcat"/>
+ <function id="41" name="View File" command="ViewFile"/>
+ <function id="106" name="Add Process to Guardian" command="AddProccess"/>
+ <function id="66" name="Update Environment" command="UpdateEnvironment"/>
+ <function id="24" name="Add Apache" command="AddApache"/>
+ <function id="57" name="View ApachePool" command="ViewApachePool"/>
+ <function id="116" name="Update Help Entry" command="UpdateHelpItem"/>
+ <function id="114" name="Add VirtualHost To Project" command="AddVirtualHostToProject"/>
+ <function id="93" name="Restart Apache" command="RestartApache"/>
+ <function id="73" name="Add Function" command="AddFunction"/>
+ <function id="43" name="Delete File" command="DeleteFile"/>
+ <function id="40" name="Add File" command="AddFile"/>
</functions>
Modified: incubator/lokahi/lokahi/trunk/conf/log4j.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/log4j.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/log4j.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/log4j.xml Thu Jul 6 08:23:21 2006
@@ -2,12 +2,12 @@
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-<!-- <appender name="console" class="org.apache.log4j.ConsoleAppender">-->
-<!-- <param name="Target" value="System.Out"/>-->
-<!-- <layout class="org.apache.log4j.PatternLayout">-->
-<!-- <param name="ConversionPattern" value="[%d{MM/dd/yyyy HH:mm:ss.SSS}] [%-5p] [%F:%L] [%C::%M] %m%n"/>-->
-<!-- </layout>-->
-<!-- </appender>-->
+ <!-- <appender name="console" class="org.apache.log4j.ConsoleAppender">-->
+ <!-- <param name="Target" value="System.Out"/>-->
+ <!-- <layout class="org.apache.log4j.PatternLayout">-->
+ <!-- <param name="ConversionPattern" value="[%d{MM/dd/yyyy HH:mm:ss.SSS}] [%-5p] [%F:%L] [%C::%M] %m%n"/>-->
+ <!-- </layout>-->
+ <!-- </appender>-->
<appender name="file" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="@CONSOLE_LOG_LOCATION@"/>
@@ -35,7 +35,7 @@
<root>
<priority value="DEBUG"/>
-<!-- <appender-ref ref="console"/>-->
+ <!-- <appender-ref ref="console"/>-->
<appender-ref ref="file"/>
</root>
Modified: incubator/lokahi/lokahi/trunk/conf/oracle.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/oracle.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/oracle.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/oracle.xml Thu Jul 6 08:23:21 2006
@@ -1,6 +1,6 @@
<database type="oracle" version="0.6.0">
<table name="AM_CONTAINER">
- <column name="CONTAINER_ID" type="NUMBER" size="0" null="false" />
+ <column name="CONTAINER_ID" type="NUMBER" size="0" null="false"/>
<column name="CONTAINER_NAME" type="VARCHAR" size="100" null="false"/>
<column name="SERVER_ROOT" type="VARCHAR" size="300" null="true"/>
<column name="LOG_LOCATION" type="VARCHAR" size="300" null="true"/>
@@ -158,11 +158,11 @@
<table name="TMC_PROJECT">
<column name="PROJECT_ID" type="NUMBER" size="0" null="false"/>
<column name="PROJECT_NAME" type="VARCHAR" size="500" null="false"/>
-<!-- <column name="FUNCTION_GROUP_ID" type="NUMBER" size="0" null="true"/>-->
-<!-- <column name="VHOST_GROUP_ID" type="NUMBER" size="0" null="true"/>-->
-<!-- <column name="CONTEXT_GROUP_ID" type="NUMBER" size="0" null="true"/>-->
-<!-- <column name="PROJECT_PARENT_ID" type="NUMBER" size="0" null="true"/>-->
-<!-- <column name="HOSTING_POOL_ID" type="NUMBER" size="0" null="true"/>-->
+ <!-- <column name="FUNCTION_GROUP_ID" type="NUMBER" size="0" null="true"/>-->
+ <!-- <column name="VHOST_GROUP_ID" type="NUMBER" size="0" null="true"/>-->
+ <!-- <column name="CONTEXT_GROUP_ID" type="NUMBER" size="0" null="true"/>-->
+ <!-- <column name="PROJECT_PARENT_ID" type="NUMBER" size="0" null="true"/>-->
+ <!-- <column name="HOSTING_POOL_ID" type="NUMBER" size="0" null="true"/>-->
</table>
<table name="TMC_REL_ALERT_PROJECT">
<column name="ALERT_ID" type="NUMBER" size="0" null="false"/>
Modified: incubator/lokahi/lokahi/trunk/conf/server-config.wsdd
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/server-config.wsdd?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/server-config.wsdd (original)
+++ incubator/lokahi/lokahi/trunk/conf/server-config.wsdd Thu Jul 6 08:23:21 2006
@@ -1,52 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
- <globalConfiguration>
- <parameter name="adminPassword" value="admin"/>
- <parameter name="sendMultiRefs" value="true"/>
- <parameter name="sendXsiTypes" value="true"/>
- <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
- <parameter name="sendXMLDeclaration" value="true"/>
- <parameter name="axis.sendMinimizedElements" value="true"/>
- <requestFlow>
- <handler type="java:org.apache.axis.handlers.JWSHandler">
- <parameter name="scope" value="session"/>
- </handler>
- <handler type="java:org.apache.axis.handlers.JWSHandler">
- <parameter name="scope" value="request"/>
- <parameter name="extension" value=".jwr"/>
- </handler>
- </requestFlow>
- </globalConfiguration>
- <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
- <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
- <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
- <service name="AdminService" provider="java:MSG">
- <parameter name="allowedMethods" value="AdminService"/>
- <parameter name="enableRemoteAdmin" value="false"/>
- <parameter name="className" value="org.apache.axis.utils.Admin"/>
- <namespace>http://xml.apache.org/axis/wsdd/</namespace>
- </service>
- <service name="Version" provider="java:RPC">
- <parameter name="allowedMethods" value="getVersion"/>
- <parameter name="className" value="org.apache.axis.Version"/>
- </service>
- <service name="TmcJob" provider="java:RPC">
- <parameter name="className" value="org.apache.lokahi.core.api.job.Job"/>
- <parameter name="allowedMethods" value="receiveResponse"/>
- </service>
- <service name="TmcController" provider="java:RPC">
- <parameter name="className" value="org.apache.lokahi.core.controller.CheckJvmThread"/>
- <parameter name="allowedMethods" value="isTheThreadRunning"/>
- </service>
- <transport name="http">
- <requestFlow>
- <handler type="URLMapper"/>
- <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
- </requestFlow>
- </transport>
- <transport name="local">
- <responseFlow>
- <handler type="LocalResponder"/>
- </responseFlow>
- </transport>
+ <globalConfiguration>
+ <parameter name="adminPassword" value="admin"/>
+ <parameter name="sendMultiRefs" value="true"/>
+ <parameter name="sendXsiTypes" value="true"/>
+ <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
+ <parameter name="sendXMLDeclaration" value="true"/>
+ <parameter name="axis.sendMinimizedElements" value="true"/>
+ <requestFlow>
+ <handler type="java:org.apache.axis.handlers.JWSHandler">
+ <parameter name="scope" value="session"/>
+ </handler>
+ <handler type="java:org.apache.axis.handlers.JWSHandler">
+ <parameter name="scope" value="request"/>
+ <parameter name="extension" value=".jwr"/>
+ </handler>
+ </requestFlow>
+ </globalConfiguration>
+ <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
+ <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
+ <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+ <service name="AdminService" provider="java:MSG">
+ <parameter name="allowedMethods" value="AdminService"/>
+ <parameter name="enableRemoteAdmin" value="false"/>
+ <parameter name="className" value="org.apache.axis.utils.Admin"/>
+ <namespace>http://xml.apache.org/axis/wsdd/</namespace>
+ </service>
+ <service name="Version" provider="java:RPC">
+ <parameter name="allowedMethods" value="getVersion"/>
+ <parameter name="className" value="org.apache.axis.Version"/>
+ </service>
+ <service name="TmcJob" provider="java:RPC">
+ <parameter name="className" value="org.apache.lokahi.core.api.job.Job"/>
+ <parameter name="allowedMethods" value="receiveResponse"/>
+ </service>
+ <service name="TmcController" provider="java:RPC">
+ <parameter name="className" value="org.apache.lokahi.core.controller.CheckJvmThread"/>
+ <parameter name="allowedMethods" value="isTheThreadRunning"/>
+ </service>
+ <transport name="http">
+ <requestFlow>
+ <handler type="URLMapper"/>
+ <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
+ </requestFlow>
+ </transport>
+ <transport name="local">
+ <responseFlow>
+ <handler type="LocalResponder"/>
+ </responseFlow>
+ </transport>
</deployment>
Modified: incubator/lokahi/lokahi/trunk/conf/state.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/state.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/state.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/state.xml Thu Jul 6 08:23:21 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<states>
-<state id="2" name="Cancel" color="red" />
-<state id="1" name="Running" color="blue" />
-<state id="0" name="New" color="blue" />
-<state id="6" name="Cron" color="blue" />
-<state id="4" name="Complete" color="green" />
-<state id="9" name="Inactive" color="red" />
-<state id="7" name="Security" color="blue" />
-<state id="8" name="Active" color="green" />
-<state id="5" name="Failed" color="red" />
+ <state id="2" name="Cancel" color="red"/>
+ <state id="1" name="Running" color="blue"/>
+ <state id="0" name="New" color="blue"/>
+ <state id="6" name="Cron" color="blue"/>
+ <state id="4" name="Complete" color="green"/>
+ <state id="9" name="Inactive" color="red"/>
+ <state id="7" name="Security" color="blue"/>
+ <state id="8" name="Active" color="green"/>
+ <state id="5" name="Failed" color="red"/>
</states>
Modified: incubator/lokahi/lokahi/trunk/conf/toolbox.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/toolbox.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/toolbox.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/toolbox.xml Thu Jul 6 08:23:21 2006
@@ -1,16 +1,16 @@
<?xml version="1.0"?>
<toolbox>
-<!-- <tool>-->
-<!-- <key>toolLoader</key>-->
-<!-- <scope>request</scope>-->
-<!-- <class>org.apache.velocity.tools.generic.ToolLoader</class>-->
-<!-- </tool>-->
+ <!-- <tool>-->
+ <!-- <key>toolLoader</key>-->
+ <!-- <scope>request</scope>-->
+ <!-- <class>org.apache.velocity.tools.generic.ToolLoader</class>-->
+ <!-- </tool>-->
<tool>
- <key>messages</key>
+ <key>messages</key>
<scope>request</scope>
- <class>org.apache.velocity.tools.struts.ActionMessagesTool</class>
-</tool>
+ <class>org.apache.velocity.tools.struts.ActionMessagesTool</class>
+ </tool>
<tool>
<key>link</key>
<scope>request</scope>
@@ -26,39 +26,39 @@
<scope>request</scope>
<class>org.apache.velocity.tools.struts.ErrorsTool</class>
</tool>
-<!-- <tool>-->
-<!-- <key>form</key>-->
-<!-- <scope>request</scope>-->
-<!-- <class>org.apache.velocity.tools.struts.FormTool</class>-->
-<!-- </tool>-->
-<!-- <tool> Should be using this... but don't have time to right now. -->
-<!-- <key>validator</key>-->
-<!-- <scope>request</scope>-->
-<!-- <class>org.apache.velocity.tools.struts.ValidatorTool</class>-->
-<!-- </tool>-->
- <tool>
- <key>math</key>
- <scope>application</scope>
- <class>org.apache.velocity.tools.generic.MathTool</class>
- </tool>
- <tool>
- <key>alertSet</key>
- <scope>request</scope>
- <class>org.apache.lokahi.core.api.alert.AlertTool</class>
- </tool>
- <tool>
- <key>helpHelper</key>
- <scope>request</scope>
- <class>org.apache.lokahi.core.gui.help.HelpItemTool</class>
- </tool>
- <tool>
- <key>wapTool</key>
- <scope>request</scope>
- <class>org.apache.lokahi.core.common.util.WapTool</class>
- </tool>
- <tool>
- <key>view</key>
- <scope>request</scope>
- <class>org.apache.lokahi.core.common.util.TMCVelocityViewTool</class>
- </tool>
+ <!-- <tool>-->
+ <!-- <key>form</key>-->
+ <!-- <scope>request</scope>-->
+ <!-- <class>org.apache.velocity.tools.struts.FormTool</class>-->
+ <!-- </tool>-->
+ <!-- <tool> Should be using this... but don't have time to right now. -->
+ <!-- <key>validator</key>-->
+ <!-- <scope>request</scope>-->
+ <!-- <class>org.apache.velocity.tools.struts.ValidatorTool</class>-->
+ <!-- </tool>-->
+ <tool>
+ <key>math</key>
+ <scope>application</scope>
+ <class>org.apache.velocity.tools.generic.MathTool</class>
+ </tool>
+ <tool>
+ <key>alertSet</key>
+ <scope>request</scope>
+ <class>org.apache.lokahi.core.api.alert.AlertTool</class>
+ </tool>
+ <tool>
+ <key>helpHelper</key>
+ <scope>request</scope>
+ <class>org.apache.lokahi.core.gui.help.HelpItemTool</class>
+ </tool>
+ <tool>
+ <key>wapTool</key>
+ <scope>request</scope>
+ <class>org.apache.lokahi.core.common.util.WapTool</class>
+ </tool>
+ <tool>
+ <key>view</key>
+ <scope>request</scope>
+ <class>org.apache.lokahi.core.common.util.TMCVelocityViewTool</class>
+ </tool>
</toolbox>
Modified: incubator/lokahi/lokahi/trunk/conf/validation.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/validation.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/validation.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/validation.xml Thu Jul 6 08:23:21 2006
@@ -1,17 +1,16 @@
-
<form-validation>
<formset>
-<!-- <form name="authForm">-->
-<!-- <field property="userName" depends="required">-->
-<!-- <msg key="error.emptyField" name="error.userName"/>-->
-<!-- <arg0 key="login.label.userName"/>-->
-<!-- </field>-->
-<!-- <field property="passWord" depends="required">-->
-<!-- <msg key="error.emptyField" name="error.passWord"/>-->
-<!-- <arg0 key="login.label.passWord"/>-->
-<!-- </field>-->-->
-<!-- http://jakarta.apache.org/struts/userGuide/dev_validator.html-->
-<!-- </form>-->
+ <!-- <form name="authForm">-->
+ <!-- <field property="userName" depends="required">-->
+ <!-- <msg key="error.emptyField" name="error.userName"/>-->
+ <!-- <arg0 key="login.label.userName"/>-->
+ <!-- </field>-->
+ <!-- <field property="passWord" depends="required">-->
+ <!-- <msg key="error.emptyField" name="error.passWord"/>-->
+ <!-- <arg0 key="login.label.passWord"/>-->
+ <!-- </field>-->-->
+ <!-- http://jakarta.apache.org/struts/userGuide/dev_validator.html-->
+ <!-- </form>-->
<form name="UserForm">
<field property="userName" depends="required">
<msg name="error" key="error.emptyField"/>
@@ -38,7 +37,6 @@
</form>
-
<form name="ContextDeleteForm">
<field property="id" depends="required">
<msg name="error" key="error.nothingToDelete"/>
@@ -203,8 +201,8 @@
</field>
<field property="daysOlder" depends="required,integer">
<msg name="error" key="error.nothingToSearch"/>
- </field>
- </form>
+ </field>
+ </form>
</formset>
</form-validation>
Modified: incubator/lokahi/lokahi/trunk/conf/validator-rules-1_1.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/validator-rules-1_1.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/validator-rules-1_1.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/validator-rules-1_1.xml Thu Jul 6 08:23:21 2006
@@ -1,6 +1,6 @@
<!DOCTYPE form-validation PUBLIC
- "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.0//EN"
- "http://jakarta.apache.org/commons/dtds/validator_1_0.dtd">
+ "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.0//EN"
+ "http://jakarta.apache.org/commons/dtds/validator_1_0.dtd">
<!--
This file contains the default Struts Validator pluggable validator
@@ -41,19 +41,19 @@
<form-validation>
- <global>
+ <global>
- <validator name="required"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="required"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateRequired"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- msg="errors.required">
+ msg="errors.required">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateRequired(form) {
var isValid = true;
var focusField = null;
@@ -62,14 +62,14 @@
oRequired = new required();
for (x in oRequired) {
var field = form[oRequired[x][0]];
-
+
if (field.type == 'text' ||
field.type == 'textarea' ||
field.type == 'file' ||
field.type == 'select-one' ||
field.type == 'radio' ||
field.type == 'password') {
-
+
var value = '';
// get field's value
if (field.type == "select-one") {
@@ -80,9 +80,9 @@
} else {
value = field.value;
}
-
+
if (trim(value).length == 0) {
-
+
if (i == 0) {
focusField = field;
}
@@ -97,41 +97,41 @@
}
return isValid;
}
-
+
// Trim whitespace from left and right sides of s.
function trim(s) {
return s.replace( /^\s*/, "" ).replace( /\s*$/, "" );
}
-
+
]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="requiredif"
- classname="org.apache.struts.validator.FieldChecks"
- method="validateRequiredIf"
- methodParams="java.lang.Object,
+ <validator name="requiredif"
+ classname="org.apache.struts.validator.FieldChecks"
+ method="validateRequiredIf"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- msg="errors.required">
- </validator>
+ msg="errors.required">
+ </validator>
- <validator name="minlength"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="minlength"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateMinLength"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.minlength">
+ depends=""
+ msg="errors.minlength">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateMinLength(form) {
var isValid = true;
var focusField = null;
@@ -140,10 +140,10 @@
oMinLength = new minlength();
for (x in oMinLength) {
var field = form[oMinLength[x][0]];
-
+
if (field.type == 'text' ||
field.type == 'textarea') {
-
+
var iMin = parseInt(oMinLength[x][2]("minlength"));
if ((trim(field.value).length > 0) && (field.value.length < iMin)) {
if (i == 0) {
@@ -160,23 +160,23 @@
}
return isValid;
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="maxlength"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="maxlength"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateMaxLength"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.maxlength">
+ depends=""
+ msg="errors.maxlength">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateMaxLength(form) {
var isValid = true;
var focusField = null;
@@ -185,10 +185,10 @@
oMaxLength = new maxlength();
for (x in oMaxLength) {
var field = form[oMaxLength[x][0]];
-
+
if (field.type == 'text' ||
field.type == 'textarea') {
-
+
var iMax = parseInt(oMaxLength[x][2]("maxlength"));
if (field.value.length > iMax) {
if (i == 0) {
@@ -205,23 +205,23 @@
}
return isValid;
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="mask"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="mask"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateMask"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.invalid">
+ depends=""
+ msg="errors.invalid">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateMask(form) {
var isValid = true;
var focusField = null;
@@ -230,11 +230,11 @@
oMasked = new mask();
for (x in oMasked) {
var field = form[oMasked[x][0]];
-
- if ((field.type == 'text' ||
- field.type == 'textarea') &&
+
+ if ((field.type == 'text' ||
+ field.type == 'textarea') &&
(field.value.length > 0)) {
-
+
if (!matchPattern(field.value, oMasked[x][2]("mask"))) {
if (i == 0) {
focusField = field;
@@ -244,7 +244,7 @@
}
}
}
-
+
if (fields.length > 0) {
focusField.focus();
alert(fields.join('\n'));
@@ -255,24 +255,24 @@
function matchPattern(value, mask) {
return mask.exec(value);
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="byte"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="byte"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateByte"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.byte"
- jsFunctionName="ByteValidations">
+ depends=""
+ msg="errors.byte"
+ jsFunctionName="ByteValidations">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateByte(form) {
var bValid = true;
var focusField = null;
@@ -281,7 +281,7 @@
oByte = new ByteValidations();
for (x in oByte) {
var field = form[oByte[x][0]];
-
+
if (field.type == 'text' ||
field.type == 'textarea' ||
field.type == 'select-one' ||
@@ -297,7 +297,7 @@
} else {
value = field.value;
}
-
+
if (value.length > 0) {
if (!isAllDigits(value)) {
bValid = false;
@@ -318,7 +318,7 @@
}
}
}
-
+
}
}
if (fields.length > 0) {
@@ -327,24 +327,24 @@
}
return bValid;
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="short"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="short"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateShort"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.short"
- jsFunctionName="ShortValidations">
+ depends=""
+ msg="errors.short"
+ jsFunctionName="ShortValidations">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateShort(form) {
var bValid = true;
var focusField = null;
@@ -353,12 +353,12 @@
oShort = new ShortValidations();
for (x in oShort) {
var field = form[oShort[x][0]];
-
+
if (field.type == 'text' ||
field.type == 'textarea' ||
field.type == 'select-one' ||
field.type == 'radio') {
-
+
var value = '';
// get field's value
if (field.type == "select-one") {
@@ -369,7 +369,7 @@
} else {
value = field.value;
}
-
+
if (value.length > 0) {
if (!isAllDigits(value)) {
bValid = false;
@@ -379,7 +379,7 @@
fields[i++] = oShort[x][1];
} else {
-
+
var iValue = parseInt(value);
if (isNaN(iValue) || !(iValue >= -32768 && iValue <= 32767)) {
if (i == 0) {
@@ -398,24 +398,24 @@
}
return bValid;
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="integer"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="integer"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateInteger"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.integer"
- jsFunctionName="IntegerValidations">
+ depends=""
+ msg="errors.integer"
+ jsFunctionName="IntegerValidations">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateInteger(form) {
var bValid = true;
var focusField = null;
@@ -429,7 +429,7 @@
field.type == 'textarea' ||
field.type == 'select-one' ||
field.type == 'radio') {
-
+
var value = '';
// get field's value
if (field.type == "select-one") {
@@ -440,16 +440,16 @@
} else {
value = field.value;
}
-
+
if (value.length > 0) {
-
+
if (!isAllDigits(value)) {
bValid = false;
if (i == 0) {
focusField = field;
}
fields[i++] = oInteger[x][1];
-
+
} else {
var iValue = parseInt(value);
if (isNaN(iValue) || !(iValue >= -2147483648 && iValue <= 2147483647)) {
@@ -483,42 +483,42 @@
} else if (argvalue.charAt(0) == "-") {
startFrom = 1;
}
-
+
for (var n = startFrom; n < argvalue.length; n++) {
if (validChars.indexOf(argvalue.substring(n, n+1)) == -1) return false;
}
return true;
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="long"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="long"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateLong"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.long"/>
+ depends=""
+ msg="errors.long"/>
- <validator name="float"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="float"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateFloat"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.float"
- jsFunctionName="FloatValidations">
+ depends=""
+ msg="errors.float"
+ jsFunctionName="FloatValidations">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateFloat(form) {
var bValid = true;
var focusField = null;
@@ -527,12 +527,12 @@
oFloat = new FloatValidations();
for (x in oFloat) {
var field = form[oFloat[x][0]];
-
+
if (field.type == 'text' ||
field.type == 'textarea' ||
field.type == 'select-one' ||
field.type == 'radio') {
-
+
var value = '';
// get field's value
if (field.type == "select-one") {
@@ -543,7 +543,7 @@
} else {
value = field.value;
}
-
+
if (value.length > 0) {
// remove '.' before checking digits
var tempArray = value.split('.');
@@ -575,36 +575,36 @@
}
return bValid;
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="double"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="double"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateDouble"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.double"/>
+ depends=""
+ msg="errors.double"/>
- <validator name="date"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="date"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateDate"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.date"
- jsFunctionName="DateValidations">
+ depends=""
+ msg="errors.date"
+ jsFunctionName="DateValidations">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateDate(form) {
var bValid = true;
var focusField = null;
@@ -750,42 +750,42 @@
}
return true;
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
-<!-- range is deprecated use intRange instead -->
- <validator name="range"
- classname="org.apache.struts.validator.FieldChecks"
+ <!-- range is deprecated use intRange instead -->
+ <validator name="range"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateIntRange"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends="integer"
- msg="errors.range">
+ depends="integer"
+ msg="errors.range">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateRange(form) {
return validateIntRange(form);
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="intRange"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="intRange"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateIntRange"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends="integer"
- msg="errors.range">
+ depends="integer"
+ msg="errors.range">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateIntRange(form) {
var isValid = true;
var focusField = null;
@@ -794,11 +794,11 @@
oRange = new intRange();
for (x in oRange) {
var field = form[oRange[x][0]];
-
+
if ((field.type == 'text' ||
field.type == 'textarea') &&
(field.value.length > 0)) {
-
+
var iMin = parseInt(oRange[x][2]("min"));
var iMax = parseInt(oRange[x][2]("max"));
var iValue = parseInt(field.value);
@@ -817,22 +817,22 @@
}
return isValid;
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="floatRange"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="floatRange"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateFloatRange"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends="float"
- msg="errors.range">
+ depends="float"
+ msg="errors.range">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateFloatRange(form) {
var isValid = true;
var focusField = null;
@@ -841,11 +841,11 @@
oRange = new floatRange();
for (x in oRange) {
var field = form[oRange[x][0]];
-
+
if ((field.type == 'text' ||
field.type == 'textarea') &&
(field.value.length > 0)) {
-
+
var fMin = parseFloat(oRange[x][2]("min"));
var fMax = parseFloat(oRange[x][2]("max"));
var fValue = parseFloat(field.value);
@@ -864,22 +864,22 @@
}
return isValid;
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="creditCard"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="creditCard"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateCreditCard"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.creditcard">
+ depends=""
+ msg="errors.creditcard">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateCreditCard(form) {
var bValid = true;
var focusField = null;
@@ -941,23 +941,23 @@
}
return true;
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- <validator name="email"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="email"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateEmail"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionErrors,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.email">
+ depends=""
+ msg="errors.email">
- <javascript><![CDATA[
+ <javascript><![CDATA[
function validateEmail(form) {
var bValid = true;
var focusField = null;
@@ -1035,10 +1035,10 @@
}
return true;
}]]>
- </javascript>
+ </javascript>
- </validator>
+ </validator>
- </global>
+ </global>
</form-validation>