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 [2/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...
Modified: incubator/lokahi/lokahi/trunk/conf/validator-rules.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/validator-rules.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/validator-rules.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/validator-rules.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.1.3//EN"
- "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
+ "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN"
+ "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
<!--
$Id$
@@ -47,35 +47,35 @@
<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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- msg="errors.required"/>
+ msg="errors.required"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- msg="errors.required"/>
+ msg="errors.required"/>
- <validator name="validwhen"
- msg="errors.required"
- classname="org.apache.struts.validator.validwhen.ValidWhen"
- method="validateValidWhen"
- methodParams="java.lang.Object,
+ <validator name="validwhen"
+ msg="errors.required"
+ classname="org.apache.struts.validator.validwhen.ValidWhen"
+ method="validateValidWhen"
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
@@ -83,231 +83,229 @@
javax.servlet.http.HttpServletRequest"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.minlength"
- jsFunction="org.apache.commons.validator.javascript.validateMinLength"/>
+ depends=""
+ msg="errors.minlength"
+ jsFunction="org.apache.commons.validator.javascript.validateMinLength"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.maxlength"
- jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/>
+ depends=""
+ msg="errors.maxlength"
+ jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/>
-
- <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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.invalid"/>
+ depends=""
+ msg="errors.invalid"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.byte"
- jsFunctionName="ByteValidations"/>
+ depends=""
+ msg="errors.byte"
+ jsFunctionName="ByteValidations"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.short"
- jsFunctionName="ShortValidations"/>
+ depends=""
+ msg="errors.short"
+ jsFunctionName="ShortValidations"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.integer"
- jsFunctionName="IntegerValidations"/>
-
+ depends=""
+ msg="errors.integer"
+ jsFunctionName="IntegerValidations"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.float"
- jsFunctionName="FloatValidations"/>
+ depends=""
+ msg="errors.float"
+ jsFunctionName="FloatValidations"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.date"
- jsFunctionName="DateValidations"/>
+ depends=""
+ msg="errors.date"
+ jsFunctionName="DateValidations"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends="integer"
- msg="errors.range"/>
+ depends="integer"
+ msg="errors.range"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends="float"
- msg="errors.range"/>
+ depends="float"
+ msg="errors.range"/>
- <validator name="doubleRange"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="doubleRange"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateDoubleRange"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends="double"
- msg="errors.range"/>
+ depends="double"
+ msg="errors.range"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.creditcard"/>
+ depends=""
+ msg="errors.creditcard"/>
- <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.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.email"/>
+ depends=""
+ msg="errors.email"/>
- <validator name="url"
- classname="org.apache.struts.validator.FieldChecks"
+ <validator name="url"
+ classname="org.apache.struts.validator.FieldChecks"
method="validateUrl"
- methodParams="java.lang.Object,
+ methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
org.apache.commons.validator.Field,
org.apache.struts.action.ActionMessages,
org.apache.commons.validator.Validator,
javax.servlet.http.HttpServletRequest"
- depends=""
- msg="errors.url"/>
+ depends=""
+ msg="errors.url"/>
- <!--
- This simply allows struts to include the validateUtilities into a page, it should
- not be used as a validation rule.
- -->
- <validator name="includeJavaScriptUtilities"
- classname=""
+ <!--
+ This simply allows struts to include the validateUtilities into a page, it should
+ not be used as a validation rule.
+ -->
+ <validator name="includeJavaScriptUtilities"
+ classname=""
method=""
- methodParams=""
- depends=""
- msg=""
- jsFunction="org.apache.commons.validator.javascript.validateUtilities"/>
+ methodParams=""
+ depends=""
+ msg=""
+ jsFunction="org.apache.commons.validator.javascript.validateUtilities"/>
- </global>
+ </global>
</form-validation>
Modified: incubator/lokahi/lokahi/trunk/conf/web.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/web.xml?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/web.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/web.xml Thu Jul 6 08:23:21 2006
@@ -1,199 +1,199 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <servlet>
- <servlet-name>TMCStartupServlet</servlet-name>
- <servlet-class>org.apache.lokahi.core.gui.www.TMCStartupServlet</servlet-class>
-
- <init-param>
- <param-name>JvmHttp</param-name>
- <param-value>8008</param-value>
- </init-param>
- <init-param>
- <param-name>log4j-init-file</param-name>
- <param-value>WEB-INF/log4j.xml</param-value>
- </init-param>
- <init-param>
- <param-name>properties</param-name>
- <param-value>lokahi.properties</param-value>
- </init-param>
-
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>action</servlet-name>
- <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
- <init-param>
- <param-name>config</param-name>
- <param-value>/WEB-INF/struts-config.xml</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>1</param-value>
- </init-param>
- <init-param>
- <param-name>detail</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>validate</param-name>
- <param-value>true</param-value>
- </init-param>
- <load-on-startup>3</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>velocity</servlet-name>
- <servlet-class>org.apache.lokahi.core.gui.www.TMCVelocityServlet</servlet-class>
- <init-param>
- <param-name>org.apache.velocity.toolbox</param-name>
- <param-value>/WEB-INF/toolbox.xml</param-value>
- </init-param>
- <init-param>
- <param-name>org.apache.velocity.properties</param-name>
- <param-value>/WEB-INF/velocity.properties</param-value>
- </init-param>
- <load-on-startup>4</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>AxisServlet</servlet-name>
- <display-name>Apache-Axis Servlet</display-name>
- <servlet-class>
- org.apache.axis.transport.http.AxisServlet
- </servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>AdminServlet</servlet-name>
- <display-name>Axis Admin Servlet</display-name>
- <servlet-class>
- org.apache.axis.transport.http.AdminServlet
- </servlet-class>
- <load-on-startup>2</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>TMCRSSAlertFeed</servlet-name>
- <display-name>TMC Alert RSS Feed</display-name>
- <servlet-class>org.apache.lokahi.core.gui.www.TMCRSSAlertServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>TMCRest</servlet-name>
- <display-name>TMC Rest</display-name>
- <servlet-class>org.apache.lokahi.core.gui.www.RestServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/servlet/AxisServlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>TMCRSSAlertFeed</servlet-name>
- <url-pattern>/rss/alert</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>TMCRest</servlet-name>
- <url-pattern>/rest/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>*.jws</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
- <!-- Standard Action Servlet Mapping -->
- <servlet-mapping>
- <servlet-name>action</servlet-name>
- <url-pattern>*.do</url-pattern>
- </servlet-mapping>
-
- <!-- Map *.vm files to Velocity -->
- <servlet-mapping>
- <servlet-name>velocity</servlet-name>
- <url-pattern>*.vm</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>velocity</servlet-name>
- <url-pattern>*.vmcss</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>velocity</servlet-name>
- <url-pattern>*.wml</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>TMCStartupServlet</servlet-name>
- <url-pattern>/TMCStartupServlet</url-pattern>
- </servlet-mapping>
-
- <session-config>
- <session-timeout>20</session-timeout>
- </session-config>
-
- <!-- currently the W3C havent settled on a media type for WSDL;
- http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
- for now we go with the basic 'it's XML' response -->
- <mime-mapping>
- <extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
-
- <mime-mapping>
- <extension>xsd</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
- <mime-mapping>
- <extension>vmcss</extension>
- <mime-type>text/css</mime-type>
- </mime-mapping>
-
- <!-- welcome file list -->
- <welcome-file-list>
- <welcome-file>index.vm</welcome-file>
- </welcome-file-list>
+ <servlet>
+ <servlet-name>TMCStartupServlet</servlet-name>
+ <servlet-class>org.apache.lokahi.core.gui.www.TMCStartupServlet</servlet-class>
+
+ <init-param>
+ <param-name>JvmHttp</param-name>
+ <param-value>8008</param-value>
+ </init-param>
+ <init-param>
+ <param-name>log4j-init-file</param-name>
+ <param-value>WEB-INF/log4j.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>properties</param-name>
+ <param-value>lokahi.properties</param-value>
+ </init-param>
+
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>action</servlet-name>
+ <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+ <init-param>
+ <param-name>config</param-name>
+ <param-value>/WEB-INF/struts-config.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>detail</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <init-param>
+ <param-name>validate</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <load-on-startup>3</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>velocity</servlet-name>
+ <servlet-class>org.apache.lokahi.core.gui.www.TMCVelocityServlet</servlet-class>
+ <init-param>
+ <param-name>org.apache.velocity.toolbox</param-name>
+ <param-value>/WEB-INF/toolbox.xml</param-value>
+ </init-param>
+ <init-param>
+ <param-name>org.apache.velocity.properties</param-name>
+ <param-value>/WEB-INF/velocity.properties</param-value>
+ </init-param>
+ <load-on-startup>4</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>AxisServlet</servlet-name>
+ <display-name>Apache-Axis Servlet</display-name>
+ <servlet-class>
+ org.apache.axis.transport.http.AxisServlet
+ </servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>AdminServlet</servlet-name>
+ <display-name>Axis Admin Servlet</display-name>
+ <servlet-class>
+ org.apache.axis.transport.http.AdminServlet
+ </servlet-class>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>TMCRSSAlertFeed</servlet-name>
+ <display-name>TMC Alert RSS Feed</display-name>
+ <servlet-class>org.apache.lokahi.core.gui.www.TMCRSSAlertServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>TMCRest</servlet-name>
+ <display-name>TMC Rest</display-name>
+ <servlet-class>org.apache.lokahi.core.gui.www.RestServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/servlet/AxisServlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>TMCRSSAlertFeed</servlet-name>
+ <url-pattern>/rss/alert</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>TMCRest</servlet-name>
+ <url-pattern>/rest/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>*.jws</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- Standard Action Servlet Mapping -->
+ <servlet-mapping>
+ <servlet-name>action</servlet-name>
+ <url-pattern>*.do</url-pattern>
+ </servlet-mapping>
+
+ <!-- Map *.vm files to Velocity -->
+ <servlet-mapping>
+ <servlet-name>velocity</servlet-name>
+ <url-pattern>*.vm</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>velocity</servlet-name>
+ <url-pattern>*.vmcss</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>velocity</servlet-name>
+ <url-pattern>*.wml</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>TMCStartupServlet</servlet-name>
+ <url-pattern>/TMCStartupServlet</url-pattern>
+ </servlet-mapping>
+
+ <session-config>
+ <session-timeout>20</session-timeout>
+ </session-config>
+
+ <!-- currently the W3C havent settled on a media type for WSDL;
+http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+for now we go with the basic 'it's XML' response -->
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <mime-mapping>
+ <extension>vmcss</extension>
+ <mime-type>text/css</mime-type>
+ </mime-mapping>
+
+ <!-- welcome file list -->
+ <welcome-file-list>
+ <welcome-file>index.vm</welcome-file>
+ </welcome-file-list>
<error-page>
<error-code>404</error-code>
<location>/error/404.vm</location>
</error-page>
- <!-- Struts Tag Library Descriptors -->
- <taglib>
- <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
- <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
- </taglib>
-
- <taglib>
- <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
- <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
- </taglib>
-
- <taglib>
- <taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
- <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
- </taglib>
-
- <taglib>
- <taglib-uri>/WEB-INF/struts-validator.tld</taglib-uri>
- <taglib-location>/WEB-INF/struts-validator.tld</taglib-location>
- </taglib>
+ <!-- Struts Tag Library Descriptors -->
+ <taglib>
+ <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
+ <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
+ </taglib>
+
+ <taglib>
+ <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
+ <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
+ </taglib>
+
+ <taglib>
+ <taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
+ <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
+ </taglib>
+
+ <taglib>
+ <taglib-uri>/WEB-INF/struts-validator.tld</taglib-uri>
+ <taglib-location>/WEB-INF/struts-validator.tld</taglib-location>
+ </taglib>
</web-app>
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/ProcessMonitor.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/ProcessMonitor.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/ProcessMonitor.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/ProcessMonitor.java Thu Jul 6 08:23:21 2006
@@ -15,10 +15,10 @@
*/
package org.apache.lokahi.core.agent.dao;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.agent.interfaces.Monitor;
import org.apache.lokahi.core.agent.interfaces.MonitoredProcess;
import org.apache.lokahi.core.agent.util.CommandLineProcess;
-import org.apache.log4j.Logger;
import java.io.IOException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXConnect.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXConnect.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXConnect.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXConnect.java Thu Jul 6 08:23:21 2006
@@ -18,11 +18,11 @@
*/
package org.apache.lokahi.core.agent.jmx;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.agent.dao.TaskType;
import org.apache.lokahi.core.agent.interfaces.AgentTask;
import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
import org.apache.lokahi.core.agent.util.TMCTaskException;
-import org.apache.log4j.Logger;
import sun.jvmstat.monitor.HostIdentifier;
import sun.jvmstat.monitor.MonitorException;
import sun.jvmstat.monitor.MonitoredHost;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXTomcat.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXTomcat.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXTomcat.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXTomcat.java Thu Jul 6 08:23:21 2006
@@ -15,10 +15,10 @@
*/
package org.apache.lokahi.core.agent.jmx;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.agent.dao.AgentJob;
import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
import org.apache.lokahi.core.api.state.State;
-import org.apache.log4j.Logger;
import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXVirtualMachine.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXVirtualMachine.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXVirtualMachine.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/jmx/JMXVirtualMachine.java Thu Jul 6 08:23:21 2006
@@ -15,8 +15,8 @@
*/
package org.apache.lokahi.core.agent.jmx;
-import org.apache.lokahi.core.agent.interfaces.MonitoredProcess;
import org.apache.log4j.Logger;
+import org.apache.lokahi.core.agent.interfaces.MonitoredProcess;
import sun.jvmstat.monitor.HostIdentifier;
import sun.jvmstat.monitor.MonitorException;
import sun.jvmstat.monitor.MonitoredHost;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/Watchdog.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/Watchdog.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/Watchdog.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/Watchdog.java Thu Jul 6 08:23:21 2006
@@ -15,9 +15,9 @@
*/
package org.apache.lokahi.core.agent.runnable;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.agent.interfaces.Monitor;
import org.apache.lokahi.core.agent.util.ProcessFactory;
-import org.apache.log4j.Logger;
import java.util.Collection;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/tomcat/HttpTomcat.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/tomcat/HttpTomcat.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/tomcat/HttpTomcat.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/tomcat/HttpTomcat.java Thu Jul 6 08:23:21 2006
@@ -15,11 +15,11 @@
*/
package org.apache.lokahi.core.agent.tomcat;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.agent.dao.AgentJob;
import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
import org.apache.lokahi.core.agent.util.TMCAgentBrowser;
import org.apache.lokahi.core.api.state.State;
-import org.apache.log4j.Logger;
import java.net.MalformedURLException;
import java.net.URL;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/ProcessFactory.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/ProcessFactory.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/ProcessFactory.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/util/ProcessFactory.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.agent.util;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.agent.dao.AgentJob;
import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
import org.apache.lokahi.core.agent.interfaces.Monitor;
@@ -22,7 +23,6 @@
import org.apache.lokahi.core.agent.jmx.JMXTomcat;
import org.apache.lokahi.core.agent.tomcat.HttpTomcat;
import org.apache.lokahi.core.api.state.State;
-import org.apache.log4j.Logger;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertDAO.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertDAO.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertDAO.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertDAO.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.api.alert;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.user.User;
import org.apache.lokahi.core.common.database.BrokerFactory;
import org.apache.lokahi.core.common.interfaces.Collectable;
@@ -22,7 +23,6 @@
import org.apache.lokahi.core.common.interfaces.Datable;
import org.apache.lokahi.core.common.interfaces.TMCBroker;
import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.log4j.Logger;
import org.jdom.Element;
import java.net.MalformedURLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertModel.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertModel.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.api.alert;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.jobpool.JobPool;
import org.apache.lokahi.core.api.state.State;
@@ -23,7 +24,6 @@
import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
import org.apache.lokahi.core.common.interfaces.LokahiModel;
import org.apache.lokahi.core.common.interfaces.TMCDao;
-import org.apache.log4j.Logger;
import java.io.IOException;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertTool.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertTool.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertTool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertTool.java Thu Jul 6 08:23:21 2006
@@ -15,10 +15,10 @@
*/
package org.apache.lokahi.core.api.alert;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.user.User;
import org.apache.lokahi.core.common.collection.TMCCollectionImpl;
import org.apache.lokahi.core.common.util.DateComparator;
-import org.apache.log4j.Logger;
import java.sql.SQLException;
import java.util.SortedSet;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/environment/Environment.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/environment/Environment.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/environment/Environment.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/environment/Environment.java Thu Jul 6 08:23:21 2006
@@ -15,12 +15,12 @@
*/
package org.apache.lokahi.core.api.environment;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.project.Project;
import org.apache.lokahi.core.common.database.BrokerFactory;
import org.apache.lokahi.core.common.interfaces.TMCBroker;
import org.apache.lokahi.core.common.interfaces.TMCDao;
import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.log4j.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/File.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/File.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/File.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/File.java Thu Jul 6 08:23:21 2006
@@ -15,12 +15,12 @@
*/
package org.apache.lokahi.core.api.file;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.common.database.BrokerFactory;
import org.apache.lokahi.core.common.interfaces.Entity;
import org.apache.lokahi.core.common.interfaces.TMCBroker;
import org.apache.lokahi.core.common.interfaces.TMCDao;
import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.log4j.Logger;
import java.sql.Blob;
import java.sql.ResultSet;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/file/FileModel.java Thu Jul 6 08:23:21 2006
@@ -58,7 +58,7 @@
}
public void deleteFile(User u, Collection<File> fi, Function f) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException {
- for (File file : fi) this.deleteFile(u, file, f);
+ for (File file : fi) this.deleteFile(u, file, f);
} //todo fix the quick hack so that we only create one jobpool for the list of files we want to delete.
public void updateFile(User u, File fi, Function f) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException {
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/instance/Instance.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/instance/Instance.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/instance/Instance.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/instance/Instance.java Thu Jul 6 08:23:21 2006
@@ -15,11 +15,11 @@
*/
package org.apache.lokahi.core.api.instance;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.common.database.BrokerFactory;
import org.apache.lokahi.core.common.interfaces.TMCBroker;
import org.apache.lokahi.core.common.interfaces.TMCDao;
import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.log4j.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/ipaddress/Ip.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/ipaddress/Ip.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/ipaddress/Ip.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/ipaddress/Ip.java Thu Jul 6 08:23:21 2006
@@ -15,11 +15,11 @@
*/
package org.apache.lokahi.core.api.ipaddress;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.common.database.BrokerFactory;
import org.apache.lokahi.core.common.interfaces.TMCBroker;
import org.apache.lokahi.core.common.interfaces.TMCDao;
import org.apache.lokahi.httpd.api.entity.VirtualHost;
-import org.apache.log4j.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/job/Job.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/job/Job.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/job/Job.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/job/Job.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.api.job;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.instance.Instance;
import org.apache.lokahi.core.api.jobpool.JobPool;
@@ -29,7 +30,6 @@
import org.apache.lokahi.core.common.message.TMCSOAPMessage;
import org.apache.lokahi.core.common.util.PropertiesFile;
import org.apache.lokahi.core.controller.AdminBean;
-import org.apache.log4j.Logger;
import java.io.IOException;
import java.sql.Blob;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/jobpool/JobPool.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/jobpool/JobPool.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/jobpool/JobPool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/jobpool/JobPool.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.api.jobpool;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.job.Job;
import org.apache.lokahi.core.api.project.Project;
@@ -27,7 +28,6 @@
import org.apache.lokahi.core.common.interfaces.TMCBroker;
import org.apache.lokahi.core.common.interfaces.TMCDao;
import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.log4j.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/pool/HostingPool.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/pool/HostingPool.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/pool/HostingPool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/pool/HostingPool.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.api.pool;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.environment.Environment;
import org.apache.lokahi.core.api.ipaddress.Ip;
import org.apache.lokahi.core.api.server.Hardware;
@@ -29,7 +30,6 @@
import org.apache.lokahi.httpd.api.worker.ApacheWorker;
import org.apache.lokahi.tomcat.api.entity.TomcatContext;
import org.apache.lokahi.tomcat.api.pool.TomcatPool;
-import org.apache.log4j.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/pool/HostingPoolModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/pool/HostingPoolModel.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/pool/HostingPoolModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/pool/HostingPoolModel.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.api.pool;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.job.Job;
import org.apache.lokahi.core.api.jobpool.JobPool;
@@ -33,7 +34,6 @@
import org.apache.lokahi.httpd.api.worker.ApacheWorker;
import org.apache.lokahi.tomcat.api.pool.TomcatPool;
import org.apache.lokahi.tomcat.api.pool.TomcatPoolModel;
-import org.apache.log4j.Logger;
import java.io.IOException;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/project/Project.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/project/Project.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/project/Project.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/project/Project.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.api.project;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.environment.Environment;
import org.apache.lokahi.core.api.jobpool.JobPool;
import org.apache.lokahi.core.api.user.User;
@@ -29,7 +30,6 @@
import org.apache.lokahi.core.common.util.PropertiesFile;
import org.apache.lokahi.httpd.api.entity.VirtualHost;
import org.apache.lokahi.tomcat.api.entity.TomcatContext;
-import org.apache.log4j.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/Hardware.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/Hardware.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/Hardware.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/Hardware.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.api.server;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.environment.Environment;
import org.apache.lokahi.core.api.instance.Instance;
import org.apache.lokahi.core.api.ipaddress.Ip;
@@ -26,7 +27,6 @@
import org.apache.lokahi.core.common.interfaces.TMCBroker;
import org.apache.lokahi.core.common.interfaces.TMCDao;
import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.log4j.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/HardwareModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/HardwareModel.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/HardwareModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/server/HardwareModel.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.api.server;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.job.Job;
import org.apache.lokahi.core.api.jobpool.JobPool;
@@ -25,7 +26,6 @@
import org.apache.lokahi.core.common.interfaces.LokahiModel;
import org.apache.lokahi.tomcat.api.server.Tomcat;
import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
-import org.apache.log4j.Logger;
import java.io.IOException;
import java.sql.SQLException;
@@ -54,21 +54,21 @@
JobPool.update(jp);
}
- public void deleteHardware(User u, Collection<Hardware> c, Function f) throws SQLException, AuthorizationException, TMCIllegalArgumentException {
- this.jpInit(f, u);
- StringBuilder opts = new StringBuilder();
- if (u.isAllowed(f) && "DeleteHardware".equals(f.getCommand())) {
- for (Hardware h : c) {
- opts.append(h.getName());
- opts.append(',');
+ public void deleteHardware(User u, Collection<Hardware> c, Function f) throws SQLException, AuthorizationException, TMCIllegalArgumentException {
+ this.jpInit(f, u);
+ StringBuilder opts = new StringBuilder();
+ if (u.isAllowed(f) && "DeleteHardware".equals(f.getCommand())) {
+ for (Hardware h : c) {
+ opts.append(h.getName());
+ opts.append(',');
Hardware.delete(h);
- }
- } else {
- throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName());
}
- jp.setState(State.COMPLETE);
- JobPool.update(jp);
+ } else {
+ throw new AuthorizationException("User " + u.getName() + " Not allowed to " + f.getName());
}
+ jp.setState(State.COMPLETE);
+ JobPool.update(jp);
+ }
public void deleteHardware(User u, Hardware h, Function f) throws SQLException, AuthorizationException, TMCIllegalArgumentException {
if (h == null || h.getPk() < 1) throw new TMCIllegalArgumentException("Hardware can not be null");
@@ -142,7 +142,7 @@
}
public void updateHardware(User u, Hardware h) throws AuthorizationException, TMCIllegalArgumentException, SQLException, IOException {
- Function f = Function.getFunction("UpdateHardware");
+ Function f = Function.getFunction("UpdateHardware");
this.updateHardware(u, h, f);
}
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/state/StateModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/state/StateModel.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/state/StateModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/state/StateModel.java Thu Jul 6 08:23:21 2006
@@ -15,9 +15,9 @@
*/
package org.apache.lokahi.core.api.state;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.common.collection.TMCSet;
import org.apache.lokahi.core.common.interfaces.LokahiModel;
-import org.apache.log4j.Logger;
import java.sql.SQLException;
import java.util.Collection;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/user/User.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/user/User.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/user/User.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/user/User.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.api.user;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.jobpool.JobPool;
import org.apache.lokahi.core.api.project.Project;
@@ -30,7 +31,6 @@
import org.apache.lokahi.core.common.util.PropertiesFile;
import org.apache.lokahi.httpd.api.entity.VirtualHost;
import org.apache.lokahi.tomcat.api.entity.TomcatContext;
-import org.apache.log4j.Logger;
import java.io.Serializable;
import java.sql.ResultSet;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authentication/AuthenticationFactory.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authentication/AuthenticationFactory.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authentication/AuthenticationFactory.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authentication/AuthenticationFactory.java Thu Jul 6 08:23:21 2006
@@ -15,9 +15,9 @@
*/
package org.apache.lokahi.core.common.authentication;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.common.exception.AuthenticationException;
import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.log4j.Logger;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authentication/DatabaseAuthentication.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authentication/DatabaseAuthentication.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authentication/DatabaseAuthentication.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authentication/DatabaseAuthentication.java Thu Jul 6 08:23:21 2006
@@ -15,11 +15,11 @@
*/
package org.apache.lokahi.core.common.authentication;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.common.database.BrokerFactory;
import org.apache.lokahi.core.common.exception.AuthenticationException;
import org.apache.lokahi.core.common.interfaces.Dao;
import org.apache.lokahi.core.common.interfaces.TMCBroker;
-import org.apache.log4j.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authorization/AuthorizationManager.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authorization/AuthorizationManager.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authorization/AuthorizationManager.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/authorization/AuthorizationManager.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.common.authorization;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.project.Project;
import org.apache.lokahi.core.api.user.User;
@@ -24,7 +25,6 @@
import org.apache.lokahi.core.common.interfaces.TMCBroker;
import org.apache.lokahi.httpd.api.entity.VirtualHost;
import org.apache.lokahi.tomcat.api.entity.TomcatContext;
-import org.apache.log4j.Logger;
import java.io.Serializable;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/TMCCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/TMCCollectionImpl.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/TMCCollectionImpl.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/collection/TMCCollectionImpl.java Thu Jul 6 08:23:21 2006
@@ -15,8 +15,8 @@
*/
package org.apache.lokahi.core.common.collection;
-import org.apache.lokahi.core.common.interfaces.Collectable;
import org.apache.log4j.Logger;
+import org.apache.lokahi.core.common.interfaces.Collectable;
import java.io.Serializable;
import java.util.AbstractCollection;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/BrokerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/BrokerFactory.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/BrokerFactory.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/BrokerFactory.java Thu Jul 6 08:23:21 2006
@@ -15,11 +15,11 @@
*/
package org.apache.lokahi.core.common.database;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.common.interfaces.Dao;
import org.apache.lokahi.core.common.interfaces.ReadOnlyBroker;
import org.apache.lokahi.core.common.interfaces.TMCBroker;
import org.apache.lokahi.core.common.interfaces.XMLDao;
-import org.apache.log4j.Logger;
import org.jdom.JDOMException;
import java.io.File;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/DerbyBroker.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/DerbyBroker.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/DerbyBroker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/DerbyBroker.java Thu Jul 6 08:23:21 2006
@@ -15,13 +15,13 @@
*/
package org.apache.lokahi.core.common.database;
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
import org.apache.lokahi.core.common.interfaces.Dao;
import org.apache.lokahi.core.common.interfaces.GenericDatabaseBroker;
import org.apache.lokahi.core.common.interfaces.TMCBroker;
import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.log4j.Logger;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/OracleBroker.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/OracleBroker.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/OracleBroker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/OracleBroker.java Thu Jul 6 08:23:21 2006
@@ -15,15 +15,15 @@
*/
package org.apache.lokahi.core.common.database;
+import oracle.jdbc.driver.OracleTypes;
+import oracle.sql.BLOB;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.common.collection.TMCSet;
import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
import org.apache.lokahi.core.common.interfaces.Dao;
import org.apache.lokahi.core.common.interfaces.GenericDatabaseBroker;
import org.apache.lokahi.core.common.interfaces.TMCBroker;
import org.apache.lokahi.core.common.util.PropertiesFile;
-import oracle.jdbc.driver.OracleTypes;
-import oracle.sql.BLOB;
-import org.apache.log4j.Logger;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/XMLBroker.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/XMLBroker.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/XMLBroker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/database/XMLBroker.java Thu Jul 6 08:23:21 2006
@@ -15,10 +15,10 @@
*/
package org.apache.lokahi.core.common.database;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.common.collection.TMCCache;
import org.apache.lokahi.core.common.interfaces.ReadOnlyBroker;
import org.apache.lokahi.core.common.interfaces.XMLDao;
-import org.apache.log4j.Logger;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Dao.java Thu Jul 6 08:23:21 2006
@@ -31,7 +31,8 @@
* internally calling the appriate constructor.
*
* @param r the resultset from a database call,
- * should include the entire object
+ * should include the entire object
+ *
* @return Object populated from the resultset
* @throws SQLException
*/
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/GenericDatabaseBroker.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/GenericDatabaseBroker.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/GenericDatabaseBroker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/GenericDatabaseBroker.java Thu Jul 6 08:23:21 2006
@@ -43,9 +43,10 @@
* Prevents the need to explictitly code all <code>CallableStatement</code>s
*
* @param csmt
- * @param returns <code>true</code> if the statement being built returns any value
+ * @param returns <code>true</code> if the statement being built returns any value
* @param returnType as specified by the jdbc driver
- * @param params passed to the stored procedure or function
+ * @param params passed to the stored procedure or function
+ *
* @return built <code>CallableStatement</code> populated with the objects in params
* @throws SQLException
*/
@@ -87,6 +88,7 @@
* <code>Dao</code> interface that the
* returned object is expected to be.
* @param r <code>ResultSet</code> to build the object out of
+ *
* @return populated object of <code>Class T</code> or <code>null</code>
*/
protected T fillObject(Class<T> c, ResultSet r) {
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/LokahiModel.java Thu Jul 6 08:23:21 2006
@@ -15,13 +15,17 @@
*/
package org.apache.lokahi.core.common.interfaces;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.jobpool.JobPool;
import org.apache.lokahi.core.api.project.Project;
import org.apache.lokahi.core.api.state.State;
import org.apache.lokahi.core.api.user.User;
-import org.apache.lokahi.core.common.exception.*;
-import org.apache.log4j.Logger;
+import org.apache.lokahi.core.common.exception.AlreadyExistException;
+import org.apache.lokahi.core.common.exception.AuthorizationException;
+import org.apache.lokahi.core.common.exception.TMCException;
+import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
+import org.apache.lokahi.core.common.exception.UnsupportedParameterException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/ReadOnlyBroker.java Thu Jul 6 08:23:21 2006
@@ -29,10 +29,11 @@
/**
* Gets a singular object from the datastore.
*
- * @param c <code>Class</code> of the expected object return.
+ * @param c <code>Class</code> of the expected object return.
* @param statement key to get the object from the datastore.
- * @param cache <code>true</code> a cached object will suffice.
- * @param params objects to look up the desired object by.
+ * @param cache <code>true</code> a cached object will suffice.
+ * @param params objects to look up the desired object by.
+ *
* @return object of <code>Class</code> c populated.
* @throws SQLException
*/
@@ -41,10 +42,11 @@
/**
* Gets a collection of objects from the datastore.
*
- * @param c <code>Class</code> of the expected object return.
+ * @param c <code>Class</code> of the expected object return.
* @param statement key to get the object from the datastore.
- * @param cache <code>true</code> a cached object will suffice.
- * @param params objects to look up the desired object by.
+ * @param cache <code>true</code> a cached object will suffice.
+ * @param params objects to look up the desired object by.
+ *
* @return object of <code>Class</code> c populated.
* @throws SQLException
*/
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/RestObject.java Thu Jul 6 08:23:21 2006
@@ -29,7 +29,8 @@
* an xml represenatation.
*
* @param name of the xml object
- * @param a Map of key, value pairs
+ * @param a Map of key, value pairs
+ *
* @return a xml object.
*/
protected static StringBuilder elementBuilder(String name, Map<String, String> a) {
@@ -50,8 +51,9 @@
/**
* builds an individual xml element.
*
- * @param name of the element.
+ * @param name of the element.
* @param value of the named element.
+ *
* @return representation of the element.
*/
protected static StringBuilder elementBuilder(String name, String value) {
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/interfaces/Restable.java Thu Jul 6 08:23:21 2006
@@ -17,7 +17,7 @@
/**
* Implemented by objects that are intended
- * to be displayed by the rest servlet.
+ * to be displayed by the rest servlet.
*
* @author Stephen Toback
* @version $Id$
@@ -30,7 +30,7 @@
* @return the xml representation
*/
StringBuilder buildXMLRepresention();
-
+
/**
* Builds a short xml representation of this object
* containing name, and primary key.
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/TMCVelocityViewTool.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.common.util;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.environment.Environment;
import org.apache.lokahi.core.api.file.File;
import org.apache.lokahi.core.api.function.Function;
@@ -36,7 +37,6 @@
import org.apache.lokahi.tomcat.api.pool.TomcatPool;
import org.apache.lokahi.tomcat.api.server.Tomcat;
import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
-import org.apache.log4j.Logger;
import java.sql.SQLException;
import java.text.ParseException;
@@ -585,10 +585,10 @@
/** @deprecated */
public Collection<State> getStates() {
Collection<State> c = null;
- c = State.getStates();
- if (c instanceof TMCCollectionImpl) {
- c = ((TMCCollectionImpl<State>) c).orderByName().values();
- }
+ c = State.getStates();
+ if (c instanceof TMCCollectionImpl) {
+ c = ((TMCCollectionImpl<State>) c).orderByName().values();
+ }
return c;
}
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/WapTool.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/WapTool.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/WapTool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/common/util/WapTool.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.common.util;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.instance.Instance;
import org.apache.lokahi.core.api.pool.HostingPool;
@@ -24,7 +25,6 @@
import org.apache.lokahi.httpd.api.worker.ApacheWorker;
import org.apache.lokahi.tomcat.api.pool.TomcatPool;
import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
-import org.apache.log4j.Logger;
import java.sql.SQLException;
import java.util.Collection;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/AdminBean.java Thu Jul 6 08:23:21 2006
@@ -20,13 +20,13 @@
package org.apache.lokahi.core.controller;
-import org.apache.lokahi.core.api.instance.Instance;
-import org.apache.lokahi.core.common.database.ConnBean;
-import org.apache.lokahi.core.common.util.PropertiesFile;
import oracle.jdbc.driver.OracleTypes;
import oracle.sql.ARRAY;
import oracle.sql.STRUCT;
import org.apache.log4j.Logger;
+import org.apache.lokahi.core.api.instance.Instance;
+import org.apache.lokahi.core.common.database.ConnBean;
+import org.apache.lokahi.core.common.util.PropertiesFile;
import java.sql.CallableStatement;
import java.sql.Connection;
@@ -217,7 +217,7 @@
* @return - array of Strings, got by splitting the String passed
*/
public String[] split(String str, String delim) {
- Vector v = new Vector();
+ Vector v = new Vector();
StringTokenizer st = new StringTokenizer(str, delim);
while (st.hasMoreTokens()) v.addElement(st.nextToken().trim());
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/CheckJvmThread.java Thu Jul 6 08:23:21 2006
@@ -20,6 +20,7 @@
* @version $Id$
*/
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.job.Job;
import org.apache.lokahi.core.api.jobpool.JobPool;
import org.apache.lokahi.core.common.exception.UnsupportedParameterException;
@@ -27,7 +28,6 @@
import org.apache.lokahi.core.common.message.MessageFactory;
import org.apache.lokahi.core.common.util.PropertiesFile;
import org.apache.lokahi.core.controller.task.SendJobTask;
-import org.apache.log4j.Logger;
import java.io.BufferedReader;
import java.io.IOException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/BuildDeployApacheConfig.java Thu Jul 6 08:23:21 2006
@@ -15,12 +15,12 @@
*/
package org.apache.lokahi.core.controller.task;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.job.Job;
import org.apache.lokahi.core.api.jobpool.JobPool;
import org.apache.lokahi.httpd.api.worker.ApacheWorker;
import org.apache.lokahi.httpd.api.worker.ApacheWorkerModel;
-import org.apache.log4j.Logger;
import java.io.IOException;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/CheckJobPoolTask.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/CheckJobPoolTask.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/CheckJobPoolTask.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/CheckJobPoolTask.java Thu Jul 6 08:23:21 2006
@@ -15,9 +15,9 @@
*/
package org.apache.lokahi.core.controller.task;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.jobpool.JobPool;
import org.apache.lokahi.core.api.state.State;
-import org.apache.log4j.Logger;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/PingPong.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/PingPong.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/PingPong.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/PingPong.java Thu Jul 6 08:23:21 2006
@@ -15,8 +15,8 @@
*/
package org.apache.lokahi.core.controller.task;
-import org.apache.lokahi.core.controller.CheckJvmThread;
import org.apache.log4j.Logger;
+import org.apache.lokahi.core.controller.CheckJvmThread;
/**
* @author Stephen Toback
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/SendJobTask.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/SendJobTask.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/SendJobTask.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/controller/task/SendJobTask.java Thu Jul 6 08:23:21 2006
@@ -15,8 +15,8 @@
*/
package org.apache.lokahi.core.controller.task;
-import org.apache.lokahi.core.api.job.Job;
import org.apache.log4j.Logger;
+import org.apache.lokahi.core.api.job.Job;
import java.io.IOException;
import java.sql.SQLException;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemAction.java Thu Jul 6 08:23:21 2006
@@ -15,13 +15,13 @@
*/
package org.apache.lokahi.core.gui.help;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.user.User;
import org.apache.lokahi.core.common.exception.AuthorizationException;
import org.apache.lokahi.core.common.exception.TMCException;
import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
import org.apache.lokahi.core.gui.www.TMCAction;
-import org.apache.log4j.Logger;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.validator.DynaValidatorForm;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemModel.java Thu Jul 6 08:23:21 2006
@@ -15,16 +15,15 @@
*/
package org.apache.lokahi.core.gui.help;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.function.Function;
import org.apache.lokahi.core.api.jobpool.JobPool;
import org.apache.lokahi.core.api.state.State;
import org.apache.lokahi.core.api.user.User;
+import org.apache.lokahi.core.common.collection.TMCSet;
import org.apache.lokahi.core.common.exception.AuthorizationException;
import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
import org.apache.lokahi.core.common.interfaces.LokahiModel;
-import org.apache.lokahi.core.common.interfaces.TMCDao;
-import org.apache.lokahi.core.common.collection.TMCSet;
-import org.apache.log4j.Logger;
import java.sql.SQLException;
import java.util.Collection;
@@ -78,12 +77,12 @@
}
public Collection<HelpItemDAO> getObjects() throws SQLException {
- return new TMCSet<HelpItemDAO>(HelpItemDAO.getHelpItems());
- }
+ return new TMCSet<HelpItemDAO>(HelpItemDAO.getHelpItems());
+ }
- public HelpItemDAO getObject(int id) throws SQLException {
- return HelpItemDAO.getHelpItem(id);
- }
+ public HelpItemDAO getObject(int id) throws SQLException {
+ return HelpItemDAO.getHelpItem(id);
+ }
}
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemTool.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemTool.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemTool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/help/HelpItemTool.java Thu Jul 6 08:23:21 2006
@@ -15,8 +15,8 @@
*/
package org.apache.lokahi.core.gui.help;
-import org.apache.lokahi.core.api.user.User;
import org.apache.log4j.Logger;
+import org.apache.lokahi.core.api.user.User;
import java.util.Collection;
import java.util.SortedSet;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/AlertAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/AlertAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/AlertAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/AlertAction.java Thu Jul 6 08:23:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.lokahi.core.gui.www;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.alert.AlertDAO;
import org.apache.lokahi.core.api.alert.AlertModel;
import org.apache.lokahi.core.api.function.Function;
@@ -22,7 +23,6 @@
import org.apache.lokahi.core.common.exception.AuthorizationException;
import org.apache.lokahi.core.common.exception.TMCException;
import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
-import org.apache.log4j.Logger;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.validator.DynaValidatorForm;
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/Authorization.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/Authorization.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/Authorization.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/Authorization.java Thu Jul 6 08:23:21 2006
@@ -15,12 +15,12 @@
*/
package org.apache.lokahi.core.gui.www;
+import org.apache.log4j.Logger;
import org.apache.lokahi.core.api.user.User;
import org.apache.lokahi.core.common.authentication.AuthenticationFactory;
import org.apache.lokahi.core.common.exception.AuthenticationException;
import org.apache.lokahi.core.common.interfaces.TMCConstants;
import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.log4j.Logger;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;