incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r419579 [3/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...
Date Thu, 06 Jul 2006 15:23:26 GMT
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/EnvironmentAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/EnvironmentAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/EnvironmentAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/EnvironmentAction.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.environment.Environment;
 import org.apache.lokahi.core.api.environment.EnvironmentModel;
 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/FileAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/FileAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/FileAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/FileAction.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.file.File;
 import org.apache.lokahi.core.api.file.FileModel;
 import org.apache.lokahi.core.api.function.Function;
@@ -23,7 +24,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/HardwareAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HardwareAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HardwareAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HardwareAction.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.function.Function;
 import org.apache.lokahi.core.api.ipaddress.Ip;
 import org.apache.lokahi.core.api.server.Hardware;
@@ -23,7 +24,6 @@
 import org.apache.lokahi.core.common.collection.TMCSet;
 import org.apache.lokahi.core.common.exception.AuthorizationException;
 import org.apache.lokahi.core.common.exception.TMCException;
-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/HostingPoolAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/HostingPoolAction.java Thu Jul  6 08:23:21 2006
@@ -15,13 +15,15 @@
 */
 package org.apache.lokahi.core.gui.www;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.function.Function;
 import org.apache.lokahi.core.api.pool.HostingPool;
 import org.apache.lokahi.core.api.pool.HostingPoolModel;
 import org.apache.lokahi.core.api.user.User;
 import org.apache.lokahi.core.common.collection.TMCSet;
-import org.apache.lokahi.core.common.exception.*;
-import org.apache.log4j.Logger;
+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.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/InstanceAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/InstanceAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/InstanceAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/InstanceAction.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.function.Function;
 import org.apache.lokahi.core.api.instance.Instance;
 import org.apache.lokahi.core.api.instance.InstanceModel;
@@ -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/ProjectAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/ProjectAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/ProjectAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/ProjectAction.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.function.Function;
 import org.apache.lokahi.core.api.project.Project;
 import org.apache.lokahi.core.api.project.ProjectModel;
@@ -25,7 +26,6 @@
 import org.apache.lokahi.core.common.exception.TMCIllegalArgumentException;
 import org.apache.lokahi.httpd.api.entity.VirtualHost;
 import org.apache.lokahi.tomcat.api.entity.TomcatContext;
-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/RestServlet.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/RestServlet.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/RestServlet.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/RestServlet.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.environment.EnvironmentModel;
 import org.apache.lokahi.core.api.file.FileModel;
 import org.apache.lokahi.core.api.function.FunctionModel;
@@ -39,7 +40,6 @@
 import org.apache.lokahi.tomcat.api.pool.TomcatPoolModel;
 import org.apache.lokahi.tomcat.api.server.TomcatModel;
 import org.apache.lokahi.tomcat.api.worker.TomcatWorkerModel;
-import org.apache.log4j.Logger;
 import org.jdom.Element;
 
 import javax.servlet.http.HttpServlet;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCAction.java Thu Jul  6 08:23:21 2006
@@ -15,11 +15,11 @@
 */
 package org.apache.lokahi.core.gui.www;
 
+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.collection.TMCSet;
 import org.apache.lokahi.core.common.interfaces.TMCDao;
-import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCRSSAlertServlet.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCRSSAlertServlet.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCRSSAlertServlet.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCRSSAlertServlet.java Thu Jul  6 08:23:21 2006
@@ -15,10 +15,10 @@
 */
 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.AlertTool;
 import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.log4j.Logger;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.output.Format;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TMCStartupServlet.java Thu Jul  6 08:23:21 2006
@@ -15,11 +15,11 @@
 */
 package org.apache.lokahi.core.gui.www;
 
+import org.apache.log4j.xml.DOMConfigurator;
 import org.apache.lokahi.core.common.database.ConnBean;
 import org.apache.lokahi.core.common.database.DerbyBroker;
 import org.apache.lokahi.core.common.util.PropertiesFile;
 import org.apache.lokahi.core.controller.CheckJvmThread;
-import org.apache.log4j.xml.DOMConfigurator;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TemplateAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TemplateAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TemplateAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/TemplateAction.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.environment.Environment;
 import org.apache.lokahi.core.api.function.Function;
 import org.apache.lokahi.core.api.ipaddress.Ip;
@@ -33,7 +34,6 @@
 import org.apache.lokahi.core.common.interfaces.FunctionableEntity;
 import org.apache.lokahi.httpd.api.entity.VirtualHost;
 import org.apache.lokahi.tomcat.api.entity.TomcatContext;
-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/UserAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/UserAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/UserAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/gui/www/UserAction.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.function.Function;
 import org.apache.lokahi.core.api.project.Project;
 import org.apache.lokahi.core.api.user.User;
@@ -23,7 +24,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/httpd/api/entity/VirtualHost.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHost.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHost.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/entity/VirtualHost.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.httpd.api.entity;
 
+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.jobpool.JobPool;
@@ -34,7 +35,6 @@
 import org.apache.lokahi.httpd.api.pool.ApachePool;
 import org.apache.lokahi.httpd.api.worker.ApacheWorker;
 import org.apache.lokahi.tomcat.api.entity.TomcatContext;
-import org.apache.log4j.Logger;
 
 import java.io.IOException;
 import java.sql.Blob;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/AMPoolWorker.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/AMPoolWorker.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/AMPoolWorker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/AMPoolWorker.java Thu Jul  6 08:23:21 2006
@@ -15,11 +15,11 @@
 */
 package org.apache.lokahi.httpd.api.pool;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.common.database.BrokerFactory;
 import org.apache.lokahi.core.common.interfaces.Cacheable;
 import org.apache.lokahi.core.common.interfaces.TMCBroker;
 import org.apache.lokahi.httpd.api.worker.ApacheWorker;
-import org.apache.log4j.Logger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePool.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePool.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePool.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.httpd.api.pool;
 
+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.server.Hardware;
@@ -26,7 +27,6 @@
 import org.apache.lokahi.core.common.util.PropertiesFile;
 import org.apache.lokahi.httpd.api.entity.VirtualHost;
 import org.apache.lokahi.httpd.api.worker.ApacheWorker;
-import org.apache.log4j.Logger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePoolModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePoolModel.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePoolModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/pool/ApachePoolModel.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.httpd.api.pool;
 
+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;
@@ -26,7 +27,6 @@
 import org.apache.lokahi.core.common.interfaces.LokahiModel;
 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.lang.reflect.InvocationTargetException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/server/Apache.java Thu Jul  6 08:23:21 2006
@@ -15,12 +15,12 @@
 */
 package org.apache.lokahi.httpd.api.server;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.file.File;
 import org.apache.lokahi.core.common.database.BrokerFactory;
 import org.apache.lokahi.core.common.interfaces.Application;
 import org.apache.lokahi.core.common.interfaces.TMCBroker;
 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/httpd/api/worker/ApacheWorker.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorker.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/api/worker/ApacheWorker.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.httpd.api.worker;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.instance.Instance;
 import org.apache.lokahi.core.api.server.Hardware;
 import org.apache.lokahi.core.api.state.State;
@@ -25,7 +26,6 @@
 import org.apache.lokahi.core.common.util.PropertiesFile;
 import org.apache.lokahi.httpd.api.pool.ApachePool;
 import org.apache.lokahi.httpd.api.server.Apache;
-import org.apache.log4j.Logger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheAction.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.httpd.gui.www;
 
+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;
@@ -23,7 +24,6 @@
 import org.apache.lokahi.core.gui.www.TMCAction;
 import org.apache.lokahi.httpd.api.server.Apache;
 import org.apache.lokahi.httpd.api.server.ApacheModel;
-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/httpd/gui/www/ApachePoolAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApachePoolAction.java Thu Jul  6 08:23:21 2006
@@ -15,15 +15,17 @@
 */
 package org.apache.lokahi.httpd.gui.www;
 
+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.collection.TMCSet;
-import org.apache.lokahi.core.common.exception.*;
+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.lokahi.httpd.api.pool.ApachePool;
 import org.apache.lokahi.httpd.api.pool.ApachePoolModel;
 import org.apache.lokahi.httpd.api.worker.ApacheWorker;
-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/httpd/gui/www/ApacheWorkerAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/ApacheWorkerAction.java Thu Jul  6 08:23:21 2006
@@ -15,14 +15,16 @@
 */
 package org.apache.lokahi.httpd.gui.www;
 
+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.collection.TMCSet;
-import org.apache.lokahi.core.common.exception.*;
+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.lokahi.httpd.api.worker.ApacheWorker;
 import org.apache.lokahi.httpd.api.worker.ApacheWorkerModel;
-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/httpd/gui/www/VirtualHostAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/VirtualHostAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/VirtualHostAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/httpd/gui/www/VirtualHostAction.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.httpd.gui.www;
 
+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.collection.TMCSet;
@@ -23,7 +24,6 @@
 import org.apache.lokahi.core.gui.www.TMCAction;
 import org.apache.lokahi.httpd.api.entity.VirtualHost;
 import org.apache.lokahi.httpd.api.entity.VirtualHostModel;
-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/tomcat/api/entity/TomcatContext.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContext.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContext.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContext.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.tomcat.api.entity;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.environment.Environment;
 import org.apache.lokahi.core.api.state.State;
 import org.apache.lokahi.core.common.database.BrokerFactory;
@@ -24,7 +25,6 @@
 import org.apache.lokahi.httpd.api.entity.VirtualHost;
 import org.apache.lokahi.tomcat.api.pool.TomcatPool;
 import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
-import org.apache.log4j.Logger;
 import org.jdom.Attribute;
 import org.jdom.Document;
 import org.jdom.Element;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.tomcat.api.entity;
 
+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;
@@ -30,7 +31,6 @@
 import org.apache.lokahi.httpd.api.entity.VirtualHost;
 import org.apache.lokahi.tomcat.api.pool.TomcatPoolModel;
 import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
-import org.apache.log4j.Logger;
 
 import java.io.IOException;
 import java.sql.SQLException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TMPoolWorker.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TMPoolWorker.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TMPoolWorker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TMPoolWorker.java Thu Jul  6 08:23:21 2006
@@ -15,11 +15,11 @@
 */
 package org.apache.lokahi.tomcat.api.pool;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.common.database.BrokerFactory;
 import org.apache.lokahi.core.common.interfaces.Cacheable;
 import org.apache.lokahi.core.common.interfaces.TMCBroker;
 import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
-import org.apache.log4j.Logger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TomcatPool.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TomcatPool.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TomcatPool.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TomcatPool.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.tomcat.api.pool;
 
+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.common.collection.TMCSet;
@@ -25,7 +26,6 @@
 import org.apache.lokahi.core.common.util.PropertiesFile;
 import org.apache.lokahi.tomcat.api.entity.TomcatContext;
 import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
-import org.apache.log4j.Logger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TomcatPoolModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TomcatPoolModel.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TomcatPoolModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/pool/TomcatPoolModel.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.tomcat.api.pool;
 
+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;
@@ -29,7 +30,6 @@
 import org.apache.lokahi.core.common.interfaces.LokahiModel;
 import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
 import org.apache.lokahi.tomcat.api.worker.TomcatWorkerModel;
-import org.apache.log4j.Logger;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/server/Tomcat.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/server/Tomcat.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/server/Tomcat.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/server/Tomcat.java Thu Jul  6 08:23:21 2006
@@ -15,11 +15,11 @@
 */
 package org.apache.lokahi.tomcat.api.server;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.common.database.BrokerFactory;
 import org.apache.lokahi.core.common.interfaces.Application;
 import org.apache.lokahi.core.common.interfaces.TMCBroker;
 import org.apache.lokahi.core.common.util.PropertiesFile;
-import org.apache.log4j.Logger;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/ServerXmlFile.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/ServerXmlFile.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/ServerXmlFile.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/ServerXmlFile.java Thu Jul  6 08:23:21 2006
@@ -15,9 +15,9 @@
 */
 package org.apache.lokahi.tomcat.api.worker;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.tomcat.api.entity.TomcatContext;
 import org.apache.lokahi.tomcat.api.server.Tomcat;
-import org.apache.log4j.Logger;
 import org.jdom.Attribute;
 import org.jdom.Document;
 import org.jdom.Element;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/TomcatWorker.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/TomcatWorker.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/TomcatWorker.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/worker/TomcatWorker.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.tomcat.api.worker;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.instance.Instance;
 import org.apache.lokahi.core.api.server.Hardware;
 import org.apache.lokahi.core.api.state.State;
@@ -26,7 +27,6 @@
 import org.apache.lokahi.tomcat.api.entity.TomcatContext;
 import org.apache.lokahi.tomcat.api.pool.TomcatPool;
 import org.apache.lokahi.tomcat.api.server.Tomcat;
-import org.apache.log4j.Logger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/ContextAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/ContextAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/ContextAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/ContextAction.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.tomcat.gui.www;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.function.Function;
 import org.apache.lokahi.core.api.pool.HostingPool;
 import org.apache.lokahi.core.api.project.Project;
@@ -28,7 +29,6 @@
 import org.apache.lokahi.httpd.api.entity.VirtualHost;
 import org.apache.lokahi.tomcat.api.entity.TomcatContext;
 import org.apache.lokahi.tomcat.api.entity.TomcatContextModel;
-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/tomcat/gui/www/TomcatAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatAction.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.tomcat.gui.www;
 
+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.collection.TMCSet;
@@ -24,7 +25,6 @@
 import org.apache.lokahi.core.gui.www.TMCAction;
 import org.apache.lokahi.tomcat.api.server.Tomcat;
 import org.apache.lokahi.tomcat.api.server.TomcatModel;
-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/tomcat/gui/www/TomcatPoolAction.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatPoolAction.java?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatPoolAction.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/gui/www/TomcatPoolAction.java Thu Jul  6 08:23:21 2006
@@ -15,6 +15,7 @@
 */
 package org.apache.lokahi.tomcat.gui.www;
 
+import org.apache.log4j.Logger;
 import org.apache.lokahi.core.api.function.Function;
 import org.apache.lokahi.core.api.server.Hardware;
 import org.apache.lokahi.core.api.user.User;
@@ -27,7 +28,6 @@
 import org.apache.lokahi.tomcat.api.pool.TomcatPoolModel;
 import org.apache.lokahi.tomcat.api.server.Tomcat;
 import org.apache.lokahi.tomcat.api.worker.TomcatWorker;
-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/www/Apache/Entity/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm Thu Jul  6 08:23:21 2006
@@ -22,71 +22,73 @@
 #parse("/layout/header.vm")
 
 <div align="center" class="contentbox">
-<br /><br />
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan="2">Infrastructure - <b>Virtualhost</b>
-  </td>
-  <td align="right">
-  #parse("Apache/Entity/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-
-
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateVirtualHost")
-
-#if($id)
-#set ($vh = $view.getVirtualHost($id))
-
-#if ($User.isAllowed("ViewVirtualHost") && $methodToCall == "UpdateVirtualHost")
-<br>Name: $!{vh.getName()}
-<br>Entry: <textarea id="entry" READONLY name="entry" cols="70" rows="7">$!{vh.getEntry()}</textarea><BR>
-<br>Environment:
-#set ($envs = $view.getEnvironments())
-
-<select name=envId>
-<option value="$!{vh.getEnv().getPk()}">$!{vh.getEnv().getName()}
-#foreach ($env in $envs)
-<option value="$env.getPk()">$env.getName()
-#end
-</select><BR>
-      
-State: Active
-#end
-<br>
-#if ($User.isAllowed("UpdateVirtualHost") && $methodToCall == "UpdateVirtualHost")
-<br><A href="$appRoot/Apache/Entity/update.vm?id=$!{id}"> Update this Vhost</a><br>
-#end
-
-#if ($User.isAllowed("DeleteVirtualHost"))
-  <form name="Form" method="post" action='$appRoot/administration/VirtualHost/Delete.do'>
-  <input type=hidden name="methodToCall" value="delete" >
-  <input type=hidden name=id value="$id">
-  <input type="submit" value="Delete">
-  </form>
-#end
-
-
-#else
-VirtualHost:
-#set ($vhosts = $view.getVirtualHosts())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($vhost in $vhosts)
-              			      <option value="$appRoot/Apache/Entity/details.vm?id=$vhost.getPk()">$vhost.getName()
-              			      #end
-              			      </select><BR>
-              			      
-#end
-</div>
-<br />
-</div>
-<br />
+  <br/><br/>
+
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan="2">Infrastructure - <b>Virtualhost</b>
+        </td>
+        <td align="right">
+          #parse("Apache/Entity/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+
+    <div class="messagebox">
+
+
+      #set ($id = $request.getParameter("id"))
+      #set ($methodToCall = "UpdateVirtualHost")
+
+      #if($id)
+      #set ($vh = $view.getVirtualHost($id))
+
+      #if ($User.isAllowed("ViewVirtualHost") && $methodToCall == "UpdateVirtualHost")
+      <br>Name: $!{vh.getName()}
+      <br>Entry: <textarea id="entry" READONLY name="entry" cols="70" rows="7">$!{vh.getEntry()}</textarea><BR>
+      <br>Environment:
+      #set ($envs = $view.getEnvironments())
+
+      <select name=envId>
+        <option value="$!{vh.getEnv().getPk()}">$!{vh.getEnv().getName()}
+          #foreach ($env in $envs)
+        <option value="$env.getPk()">$env.getName()
+          #end
+      </select><BR>
+
+      State: Active
+      #end
+      <br>
+      #if ($User.isAllowed("UpdateVirtualHost") && $methodToCall == "UpdateVirtualHost")
+      <br><A href="$appRoot/Apache/Entity/update.vm?id=$!{id}"> Update this Vhost</a><br>
+      #end
+
+      #if ($User.isAllowed("DeleteVirtualHost"))
+      <form name="Form" method="post" action='$appRoot/administration/VirtualHost/Delete.do'>
+        <input type=hidden name="methodToCall" value="delete">
+        <input type=hidden name=id value="$id">
+        <input type="submit" value="Delete">
+      </form>
+      #end
+
+
+      #else
+      VirtualHost:
+      #set ($vhosts = $view.getVirtualHosts())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($vhost in $vhosts)
+        <option value="$appRoot/Apache/Entity/details.vm?id=$vhost.getPk()">$vhost.getName()
+          #end
+      </select><BR>
+
+      #end
+    </div>
+    <br/>
+  </div>
+  <br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/global.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/global.vm Thu Jul  6 08:23:21 2006
@@ -16,10 +16,10 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Apache/Entity/details.vm">&nbsp;Details&nbsp;</option>
-<option value="$appRoot/Apache/Entity/add.vm">&nbsp;Add&nbsp;</option>
-<option value="$appRoot/Apache/Entity/update.vm">&nbsp;Update&nbsp;</option>
-<option value="$appRoot/Apache/Entity/delete.vm">&nbsp;Delete&nbsp;</option>
+  <option value="" selected>Select Action
+  <option value="$appRoot/Apache/Entity/details.vm">&nbsp;Details&nbsp;</option>
+  <option value="$appRoot/Apache/Entity/add.vm">&nbsp;Add&nbsp;</option>
+  <option value="$appRoot/Apache/Entity/update.vm">&nbsp;Update&nbsp;</option>
+  <option value="$appRoot/Apache/Entity/delete.vm">&nbsp;Delete&nbsp;</option>
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/indiv.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/indiv.vm Thu Jul  6 08:23:21 2006
@@ -16,9 +16,9 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Apache/Entity/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-<option value="$appRoot/Apache/Entity/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
-<option value="$appRoot/Apache/Entity/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  <option value="" selected>Select Action
+  <option value="$appRoot/Apache/Entity/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  <option value="$appRoot/Apache/Entity/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  <option value="$appRoot/Apache/Entity/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm Thu Jul  6 08:23:21 2006
@@ -20,18 +20,20 @@
 #parse("/layout/header.vm")
 
 <div align="center" class="contentbox">
-<br /><br />
+<br/><br/>
+
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan="2">Infrastructure - <b>Virtualhost</b>
-  </td>
-  <td align="right">
-  #parse("Apache/Entity/menu/global.vm")
-  </td>
-</tr>
+  <tr class="info" valign="top">
+    <td colspan="2">Infrastructure - <b>Virtualhost</b>
+    </td>
+    <td align="right">
+      #parse("Apache/Entity/menu/global.vm")
+    </td>
+  </tr>
 </table>
-<br />
+<br/>
+
 <div class="messagebox">
 
 #if ($request.getParameter("id"))
@@ -39,40 +41,41 @@
 #end
 
 <SCRIPT LANGUAGE=javascript>
-<!--
-function OnChange(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	//var baseURL  = "$appRoot/Apache/Entity/update.vm?tcontexts=$numberOfContexts&hostingPoolId=$hostingPoolId&id=" + SelValue;
-	var baseURL  = "$appRoot/Apache/Entity/update.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-
-function HostPoolOnChange(dropdown)
-{
-	var myindex  = dropdown.selectedIndex;
-	var SelValue = dropdown.options[myindex].value;
-	var baseURL  = "$appRoot/Apache/Entity/update.vm?id=$id&tcontexts=$numberOfContexts&hostingPoolId=" + SelValue;
-	//var baseURL  = "$appRoot/Apache/Entity/update.vm?id=" + SelValue;
-	top.location.href = baseURL;
-
-	return true;
-}
-
-function switchCheckBoxes() {
-		if (document.Form.nameVirtualHost.checked) {
-			document.Form.catchAll.disabled = false;
-			document.Form.catchAll.checked = false;
-		} else {
-			document.Form.catchAll.checked = true;
-			document.Form.catchAll.disabled = true; }
+  <!--
+  function OnChange(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+    //var baseURL  = "$appRoot/Apache/Entity/update.vm?tcontexts=$numberOfContexts&hostingPoolId=$hostingPoolId&id=" + SelValue;
+    var baseURL = "$appRoot/Apache/Entity/update.vm?id=" + SelValue;
+    top.location.href = baseURL;
+
+    return true;
+  }
+
+  function HostPoolOnChange(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+    var baseURL = "$appRoot/Apache/Entity/update.vm?id=$id&tcontexts=$numberOfContexts&hostingPoolId=" + SelValue;
+    //var baseURL  = "$appRoot/Apache/Entity/update.vm?id=" + SelValue;
+    top.location.href = baseURL;
+
+    return true;
+  }
+
+  function switchCheckBoxes() {
+    if (document.Form.nameVirtualHost.checked) {
+      document.Form.catchAll.disabled = false;
+      document.Form.catchAll.checked = false;
+    } else {
+      document.Form.catchAll.checked = true;
+      document.Form.catchAll.disabled = true;
+    }
 
-	} // end of unShade function
+  } // end of unShade function
 
-//-->
+  //-->
 </SCRIPT>
 
 #if ($id)
@@ -82,104 +85,104 @@
 #set ($hostingPoolId = $request.getParameter("hostingPoolId"))
 
 <form name="Form" method="post" action='$link.setAction("templating/AddVirtualHostAction")'>
-<input type="hidden" id="methodToCall" name="methodToCall" value="UpdateVirtualHost">
-<input type="hidden" id="id" name="id" value="$id">
-Hosting Pool:
-#set ($hps = $view.getHostingPools())
-               <select name=hostingPoolId onchange='HostPoolOnChange(this);'>
-              			      #foreach ($hp in $hps)
-              			        #if((!$hostingPoolId) || ($vhost.getHostingPool().getPk() == $hostingPoolId))
-              			       		#set ($hpcomp = $vhost.getHostingPool())
-              			        #else 
-              			            #set ($hpcomp = $view.getHostingPool($hostingPoolId))
-              			        #end
-              			        
-	              			   	#if ($hp == $hpcomp)
-	              			    <option value="$hp.getPk()" selected>$hp.getName()
-              			        #else
-	               			    <option value="$hp.getPk()">$hp.getName()
-              			        #end
-              			     #end 
-              			      </select><BR>
-Server Name: <input type="text"  readonly id="vhostName" name="vhostName" value="$!{vhost.getName()}"><BR>
-Entry:
-<textarea id="entry" name="entry" cols="70" rows="7">$!{vhost.getEntry()}</textarea><br>
-NameVirtualHost: <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><BR>
-Catch All: <input type=checkbox name=catchAll value=true><BR>
-<!--Aliases (space delimited):
+  <input type="hidden" id="methodToCall" name="methodToCall" value="UpdateVirtualHost">
+  <input type="hidden" id="id" name="id" value="$id">
+  Hosting Pool:
+  #set ($hps = $view.getHostingPools())
+  <select name=hostingPoolId onchange='HostPoolOnChange(this);'>
+    #foreach ($hp in $hps)
+    #if((!$hostingPoolId) || ($vhost.getHostingPool().getPk() == $hostingPoolId))
+    #set ($hpcomp = $vhost.getHostingPool())
+    #else
+    #set ($hpcomp = $view.getHostingPool($hostingPoolId))
+    #end
+
+    #if ($hp == $hpcomp)
+    <option value="$hp.getPk()" selected>$hp.getName()
+      #else
+    <option value="$hp.getPk()">$hp.getName()
+      #end
+      #end
+  </select><BR>
+  Server Name: <input type="text" readonly id="vhostName" name="vhostName" value="$!{vhost.getName()}"><BR>
+  Entry:
+  <textarea id="entry" name="entry" cols="70" rows="7">$!{vhost.getEntry()}</textarea><br>
+  NameVirtualHost: <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><BR>
+  Catch All: <input type=checkbox name=catchAll value=true><BR>
+  <!--Aliases (space delimited):
 <textarea id="aliases" name="aliases" cols="70" rows="2">$!{aliases}</textarea><BR>-->
-<BR>
-<!--Contexts:
-#if($hostingPoolId && $projectId)
-<A href="addVhost.vm?project=$projectId&tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
-#elseif($hostingPoolId)
-<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
-#elseif($projectId)
-<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&project=$projectId">Add another</a><br>
-#else
-<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)">Add another</a><br>
-#end
+  <BR>
+  <!--Contexts:
+  #if($hostingPoolId && $projectId)
+  <A href="addVhost.vm?project=$projectId&tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+  #elseif($hostingPoolId)
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+  #elseif($projectId)
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&project=$projectId">Add another</a><br>
+  #else
+  <A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)">Add another</a><br>
+  #end
 
-#if ($numberOfContexts > 0)
-#foreach($context in [1..$numberOfContexts])
-Context Name: <input type="text" readonly id="contextName" name="contextName" value="$!{contextName}"> here again need to be able to add an existing...<BR>
-DocBase: <input type="text"  readonly id="docBase" name="docBase" value="$!{docBase}"> <BR>
-#end
-#end
--->
-#if((!$hostingPoolId) || ($vhost.getHostingPool().getPk() == $hostingPoolId))
-#set ($treemap = $vhost.getIps())
-#set ($hardware = $vhost.getHostingPool().getApachePool().getHardwares())
+  #if ($numberOfContexts > 0)
+  #foreach($context in [1..$numberOfContexts])
+  Context Name: <input type="text" readonly id="contextName" name="contextName" value="$!{contextName}"> here again need to be able to add an existing...<BR>
+  DocBase: <input type="text"  readonly id="docBase" name="docBase" value="$!{docBase}"> <BR>
+  #end
+  #end
+  -->
+  #if((!$hostingPoolId) || ($vhost.getHostingPool().getPk() == $hostingPoolId))
+  #set ($treemap = $vhost.getIps())
+  #set ($hardware = $vhost.getHostingPool().getApachePool().getHardwares())
 
-Ips for $vhost.getHostingPool().getName():<br>
-Servername:  IP:<BR>
+  Ips for $vhost.getHostingPool().getName():<br>
+  Servername: IP:<BR>
   #foreach ($h in $hardware)
-    #set ($ipSelected = $treemap.get($h))
-$h.getName() <select name=ipId>
-    #foreach ($ip in $h.getIps())
-      #if ($ipSelected == $ip)
-        <option value="$ip.getPk()" selected>$ip.getName()
-      #else
-        <option value="$ip.getPk()">$ip.getName()
-      #end
+  #set ($ipSelected = $treemap.get($h))
+  $h.getName() <select name=ipId>
+  #foreach ($ip in $h.getIps())
+  #if ($ipSelected == $ip)
+  <option value="$ip.getPk()" selected>$ip.getName()
+    #else
+  <option value="$ip.getPk()">$ip.getName()
     #end
-  </select><br>
+    #end
+</select><br>
   #end
 
-#else
+  #else
   #set ($hp = $view.getHostingPool($hostingPoolId))
   #set ($ap = $hp.getApachePool())
   #set($hardware = $ap.getHardwares())
 
-Ips for $hp.getName():<br>
-Servername:  IP:<BR>
+  Ips for $hp.getName():<br>
+  Servername: IP:<BR>
   #foreach ($h in $hardware)
-$h.getName() <select name=ipId>
-    #foreach ($ip in $h.getIps())
-    <option value="$ip.getPk()">$ip.getName()
+  $h.getName() <select name=ipId>
+  #foreach ($ip in $h.getIps())
+  <option value="$ip.getPk()">$ip.getName()
     #end
-  </select><br>
+</select><br>
   #end
 
-#end
+  #end
 
-<input type="submit" value="submit">
+  <input type="submit" value="submit">
 </form>
 #else
 VirtualHost:
 #set ($vhosts = $view.getVirtualHosts())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($vhost in $vhosts)
-              			      <option value="$vhost.getPk()">$vhost.getName()
-              			      #end
-              			      </select><BR>
+<select name=id onchange='OnChange(this);'>
+  <option value="">Select one
+    #foreach ($vhost in $vhosts)
+  <option value="$vhost.getPk()">$vhost.getName()
+    #end
+</select><BR>
 
 #end
 </div>
-<br />
+<br/>
 </div>
-<br />
+<br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm Thu Jul  6 08:23:21 2006
@@ -20,18 +20,19 @@
 #parse("/layout/header.vm")
 
 <div align="center" class="contentbox">
-<br /><br />
+<br/><br/>
+
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan="2">Infrastructure - <b>Apache Pool</b>
-  </td>
-  <td align="right">
-  #parse("Apache/Pool/menu/global.vm")
-  </td>
-</tr>
+  <tr class="info" valign="top">
+    <td colspan="2">Infrastructure - <b>Apache Pool</b>
+    </td>
+    <td align="right">
+      #parse("Apache/Pool/menu/global.vm")
+    </td>
+  </tr>
 </table>
-<br />
+<br/>
 
 ##<div id="bigright">
 <div class="messagebox">
@@ -49,105 +50,105 @@
 <!-- Number of workers: $numberOfWorkers --><BR><BR>
 
 <form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
-<table>
-<tr>
-<td>
-Pool Name:
-</td>
-<td>
-#if($id)
-#set ($apachePool = $view.getApachePool($id))
-<input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}">
-#else
-<input type="text" id="poolName" name="poolName" value="$!{poolName}">
-#end
-</td>
-</tr>
-<tr>
-<td>
-Environment:
-</td>
-<td>
-#set ($envs = $view.getEnvironments())
-<select name=envId>
-			      #foreach ($env in $envs)
-			      <option value="$env.getPk()">$env.getName()
-			      #end
-			      </select>
-</td>
-</tr>
-<tr>
-<td collspan="2">
-<A href="add.vm?workers=$math.add($numberOfWorkers, 1)"> Add another Apache Worker</A>
-</td>
-</tr>
-<tr>
-<td>
-Apache Container:
-</td>
-<td>
-Hardware:
-</td>
-</tr>
-#if ($id)
-  #set($Apaches = $view.getApaches())
-  #set($hardware = $view.getHardwares())
-#else
-  #set($Apaches = $view.getApaches())
-  #set($hardware = $view.getHardwares())
-#end
-
-#if ($id)
-#foreach($run in [1..$numberOfWorkers])
-<tr>
-<td>
-$run
-<select name=apacheId>
-			      #foreach ($apache in $Apaches)
-			      <option value="$apache.getPk()">$apache.getName()
-			      #end
-			      </select>
-
-</td>
-<td>
-<select name=hardwareId>
-			      #foreach ($h in $hardware)
-			      <option value="$h.getPk()">$h.getName()
-			      #end
-			      </select>
-</td>
-</tr>
-#end
-#else
-#foreach($run in [1..$numberOfWorkers])
-<tr>
-<td>
-$run
-<select name=apacheId>
-			      #foreach ($apache in $Apaches)
-			      <option value="$apache.getPk()">$apache.getName()
-			      #end
-			      </select>
-
-</td>
-<td>
-<select name=hardwareId>
-			      #foreach ($h in $hardware)
-			      <option value="$h.getPk()">$h.getName()
-			      #end
-			      </select>
-</td>
-</tr>
-#end
-#end
-</table>
-<input type="hidden" name="methodToCall" value="AddApachePool">
-<input type="submit" value="submit">
+  <table>
+    <tr>
+      <td>
+        Pool Name:
+      </td>
+      <td>
+        #if($id)
+        #set ($apachePool = $view.getApachePool($id))
+        <input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}">
+        #else
+        <input type="text" id="poolName" name="poolName" value="$!{poolName}">
+        #end
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Environment:
+      </td>
+      <td>
+        #set ($envs = $view.getEnvironments())
+        <select name=envId>
+          #foreach ($env in $envs)
+          <option value="$env.getPk()">$env.getName()
+            #end
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td collspan="2">
+        <A href="add.vm?workers=$math.add($numberOfWorkers, 1)"> Add another Apache Worker</A>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        Apache Container:
+      </td>
+      <td>
+        Hardware:
+      </td>
+    </tr>
+    #if ($id)
+    #set($Apaches = $view.getApaches())
+    #set($hardware = $view.getHardwares())
+    #else
+    #set($Apaches = $view.getApaches())
+    #set($hardware = $view.getHardwares())
+    #end
+
+    #if ($id)
+    #foreach($run in [1..$numberOfWorkers])
+    <tr>
+      <td>
+        $run
+        <select name=apacheId>
+          #foreach ($apache in $Apaches)
+          <option value="$apache.getPk()">$apache.getName()
+            #end
+        </select>
+
+      </td>
+      <td>
+        <select name=hardwareId>
+          #foreach ($h in $hardware)
+          <option value="$h.getPk()">$h.getName()
+            #end
+        </select>
+      </td>
+    </tr>
+    #end
+    #else
+    #foreach($run in [1..$numberOfWorkers])
+    <tr>
+      <td>
+        $run
+        <select name=apacheId>
+          #foreach ($apache in $Apaches)
+          <option value="$apache.getPk()">$apache.getName()
+            #end
+        </select>
+
+      </td>
+      <td>
+        <select name=hardwareId>
+          #foreach ($h in $hardware)
+          <option value="$h.getPk()">$h.getName()
+            #end
+        </select>
+      </td>
+    </tr>
+    #end
+    #end
+  </table>
+  <input type="hidden" name="methodToCall" value="AddApachePool">
+  <input type="submit" value="submit">
 </form>
 </div>
-<br />
+<br/>
 </div>
-<br />
+<br/>
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm Thu Jul  6 08:23:21 2006
@@ -17,11 +17,11 @@
 ##
 #if ($User.isAllowed($function) && $methodToCall && $actionLink)
 <form name="Form" method="post" action='$link.setAction($actionLink)'>
-<input type=hidden name="methodToCall" value="$methodToCall" >
-<input type="submit" value="$buttonName"><BR>
-$methodToCall
-<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
-$individual.getName()
+  <input type=hidden name="methodToCall" value="$methodToCall">
+  <input type="submit" value="$buttonName"><BR>
+  $methodToCall
+  <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
+  $individual.getName()
 </form>
 #end
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm Thu Jul  6 08:23:21 2006
@@ -27,132 +27,132 @@
 #end
 
 <div align="center" class="contentbox">
-<br /><br />
+<br/><br/>
 
 <div class="projectbox">
 <table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan="2">Infrastructure - <b>Apache Pool</b>
-  </td>
-  <td align="right">
-  #parse("/Apache/Pool/menu/global.vm")
-  </td>
-</tr>
+  <tr class="info" valign="top">
+    <td colspan="2">Infrastructure - <b>Apache Pool</b>
+    </td>
+    <td align="right">
+      #parse("/Apache/Pool/menu/global.vm")
+    </td>
+  </tr>
 </table>
-<br />
+<br/>
 
 #if ($id)
-  #set ($apachePool = $view.getApachePool($id))
+#set ($apachePool = $view.getApachePool($id))
 
 <table width="95%" border="0" cellspacing="0" cellpadding="1">
   <tr height="15" class="info">
-	<td align="left" valign="center" colspan=2 >
-	  Apache Pool - $!{apachePool.getName()}
-	</b>
-	</td>
-	<TD align=right>
-  #set($ent = $apachePool)
-  #parse("/Apache/Pool/menu/indiv.vm")
+    <td align="left" valign="center" colspan=2>
+      Apache Pool - $!{apachePool.getName()}
+    </b>
+  </td>
+  <TD align=right>
+    #set($ent = $apachePool)
+    #parse("/Apache/Pool/menu/indiv.vm")
   </tr>
-			<tr class="headercolor1">
+  <tr class="headercolor1">
 			<td>Environment</td><td><A href="$appRoot/Core/Environment/details.vm?id=$!{apachePool.getEnv().getPk()}">$!{apachePool.getEnv().getName()}</a></td><td> </td></tr>
-			<tr class="headercolor2">
-			<td>Apache Workers:</td><td></td><td></td></tr>
-        #set ($apacheWorkers = $apachePool.getApaches())
-        #set ($c=1)
-        #foreach ($worker in $apacheWorkers)
-          <tr class="headercolor2">
-			    <td> </td>
-			    <td class="bodycolor2$c"><A href="$appRoot/Apache/Worker/$page?id=$worker.getPk()">$worker.getName()</a></td>
-			    <td align="right" class="bodycolor2$c">
-    #set($ent = $worker)
-    #parse("/Apache/Worker/menu/indiv.vm")
-			       </td>
-			    </tr>
-          #if ($c == 1)
-            #set($c=2)
-          #else
-            #set($c=1)
-          #end
-        #end
+  <tr class="headercolor2">
+    <td>Apache Workers:</td><td></td><td></td></tr>
+  #set ($apacheWorkers = $apachePool.getApaches())
+  #set ($c=1)
+  #foreach ($worker in $apacheWorkers)
+  <tr class="headercolor2">
+    <td></td>
+    <td class="bodycolor2$c"><A href="$appRoot/Apache/Worker/$page?id=$worker.getPk()">$worker.getName()</a></td>
+    <td align="right" class="bodycolor2$c">
+      #set($ent = $worker)
+      #parse("/Apache/Worker/menu/indiv.vm")
+    </td>
+  </tr>
+  #if ($c == 1)
+  #set($c=2)
+  #else
+  #set($c=1)
+  #end
+  #end
 </table>
 
 #set ($collection = $view.getHostingPools($apachePool))
 #if( $collection && ! $collection.isEmpty())
-<br />
+<br/>
 #parse("/Core/Pool/list.vm")
-#end 
+#end
 
 #set ($vhosts = $view.getVirtualHosts($User, $apachePool))
 #if( $vhosts && ! $vhosts.isEmpty())
 <br>
-  <table width="95%" border="0" cellspacing="0" cellpadding="1">
+<table width="95%" border="0" cellspacing="0" cellpadding="1">
   <tr height="15" class="info">
-	<td align="left" valign="center" colspan=4 >
-	  Virtualhosts
-	</b>
-	</td>
-  </tr>
-  <tr class="info">
+    <td align="left" valign="center" colspan=4>
+      Virtualhosts
+    </b>
+  </td>
+</tr>
+<tr class="info">
   <th width=25%> Hostname </th>
   <th width=15%> Environment </th>
   <th width=30%> Worker </th>
-  <th width=30%>  </th>
-  </tr>
-  #set($c = 1)
-	#foreach ($vhost in $vhosts)
-		#set ($count = 1)
-    	<tr class="headercolor$c">
-		  <td><A href="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}"> $!{vhost.getName()} </td>
-    	<td> $!{vhost.getEnv().getName()} </td>
-		<td>
-		#foreach ($apacheWorker in $apachePool.getApaches())
-		  <A href="$appRoot/Apache/Worker/details.vm?id=$!{apacheWorker.getPk()}">$!{apacheWorker.getName()} </a><br>
-		#end
-		</td>
-		<td align="right">
+  <th width=30%></th>
+</tr>
+#set($c = 1)
+#foreach ($vhost in $vhosts)
+#set ($count = 1)
+<tr class="headercolor$c">
+  <td><A href="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}"> $!{vhost.getName()}</td>
+  <td> $!{vhost.getEnv().getName()} </td>
+  <td>
+    #foreach ($apacheWorker in $apachePool.getApaches())
+    <A href="$appRoot/Apache/Worker/details.vm?id=$!{apacheWorker.getPk()}">$!{apacheWorker.getName()} </a><br>
+    #end
+  </td>
+  <td align="right">
       #if ($User.isAllowed("AddContext") || $User.isAllowed("DeleteVirtualHost", $vhost) || $User.isAllowed("ViewVirtualHost",  $vhost) || $User.isAllowed("UpdateVirtualHost", $vhost))
-	      <select name=methodToCall onchange='OnChange(this);'>
-       	<option value="" selected>Select Action
+    <select name=methodToCall onchange='OnChange(this);'>
+      <option value="" selected>Select Action
         #if ($User.isAllowed("AddContext"))
-          <option value="$appRoot/Tomcat/Entity/add.vm?id=$!{vhost.getPk()}">Add a context
-          <option value="$appRoot/Tomcat/Entity/addExistingToVhost.vm?v=$!{vhost.getPk()}">Add an existing context
+      <option value="$appRoot/Tomcat/Entity/add.vm?id=$!{vhost.getPk()}">Add a context
+      <option value="$appRoot/Tomcat/Entity/addExistingToVhost.vm?v=$!{vhost.getPk()}">Add an existing context
         #end
         <!-- $User.isAllowed("DeleteVirtualHost", $vhost) -->
         #if ($User.isAllowed("DeleteVirtualHost", $vhost))
-          <option value="$appRoot/Apache/Entity/delete.vm?id=$!{vhost.getPk()}">Delete this Vhost
+      <option value="$appRoot/Apache/Entity/delete.vm?id=$!{vhost.getPk()}">Delete this Vhost
         #end
         #if ($User.isAllowed("UpdateVirtualHost", $vhost))
-          <option value="$appRoot/Apache/Entity/modify.vm?id=$!{vhost.getPk()}">Modify this Vhost
+      <option value="$appRoot/Apache/Entity/modify.vm?id=$!{vhost.getPk()}">Modify this Vhost
         #end
         #if ($User.isAllowed("ViewVirtualHost", $vhost))
-          <option value="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}">View this Vhost
+      <option value="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}">View this Vhost
         #end
-        </select>
-      #end
-		</td>
- 	  </tr>
-		#set ($count = $math.add($count, 1))
-        #if ($c == 1)
-          #set($c=2)
-        #else
-          #set($c=1)
-        #end
-	#end ##of all servers for this context
+    </select>
+    #end
+  </td>
+</tr>
+#set ($count = $math.add($count, 1))
+#if ($c == 1)
+#set($c=2)
+#else
+#set($c=1)
+#end
+#end ##of all servers for this context
 </TABLE>
-#end 	## of all contexts
+#end ## of all contexts
 
 #else
 <div class="messagebox">
 
   Apache Pool:
   #set ($aps = $view.getApachePools())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($ap in $aps)
-              			      <option value="$appRoot/Apache/Pool/$page?id=$ap.getPk()">$ap.getName()
-              			      #end
-              			      </select><BR>
+  <select name=id onchange='OnChange(this);'>
+    <option value="">Select one
+      #foreach ($ap in $aps)
+    <option value="$appRoot/Apache/Pool/$page?id=$ap.getPk()">$ap.getName()
+      #end
+  </select><BR>
 </div>
 #end
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/global.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/global.vm Thu Jul  6 08:23:21 2006
@@ -16,44 +16,44 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-#if($page)
-<option value="$appRoot/Apache/Pool/$page">&nbsp;Details&nbsp;</option>
-#else
-<option value="$appRoot/Apache/Pool/details.vm">&nbsp;Details&nbsp;</option>
-#end
-#if($User.isAllowed("UpdateApachePool"))
-<option value="$appRoot/Apache/Pool/update.vm">&nbsp;Update&nbsp;</option>
-#end
-#if($User.isAllowed("AddApachePool"))
-<option value="$appRoot/Apache/Pool/add.vm">&nbsp;Add&nbsp;</option>
-#end
-#if($User.isAllowed("DeleteApachePool"))
-<option value="$appRoot/Apache/Pool/delete.vm">&nbsp;Delete&nbsp;</option>
-#end
-#if($User.isAllowed("RestartApache"))
-<option value="$appRoot/Apache/Pool/restartapache.vm">&nbsp;Restart&nbsp;</option>
-#end
-#if($User.isAllowed("GracefulApache"))
-<option value="$appRoot/Apache/Pool/gracefulapache.vm">&nbsp;Graceful&nbsp;</option>
-#end
-#if($User.isAllowed("StopApache"))
-<option value="$appRoot/Apache/Pool/stopapache.vm">&nbsp;Stop&nbsp;</option>
-#end
-#if($User.isAllowed("StartApache"))
-<option value="$appRoot/Apache/Pool/startapache.vm">&nbsp;Start&nbsp;</option>
-#end
-#if($User.isAllowed("ConfigtestApache"))
-<option value="$appRoot/Apache/Pool/configtestapache.vm">&nbsp;Configtest&nbsp;</option>
-#end
-#if($User.isAllowed("ViewApachePool"))
-<option value="$appRoot/Apache/Pool/viewconf.vm">&nbsp;View Apache Config&nbsp;</option>
-#end
-#if($User.isAllowed("ViewApachePool"))
-<option value="$appRoot/Apache/Pool/viewprop.vm">&nbsp;View workers.properties&nbsp;</option>
-#end
-#if($User.isAllowed("DeployApacheConfig"))
-<option value="$appRoot/Apache/Pool/deployconf.vm">&nbsp;Deploy Apache Config&nbsp;</option>
-#end
+  <option value="" selected>Select Action
+    #if($page)
+  <option value="$appRoot/Apache/Pool/$page">&nbsp;Details&nbsp;</option>
+  #else
+  <option value="$appRoot/Apache/Pool/details.vm">&nbsp;Details&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateApachePool"))
+  <option value="$appRoot/Apache/Pool/update.vm">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("AddApachePool"))
+  <option value="$appRoot/Apache/Pool/add.vm">&nbsp;Add&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteApachePool"))
+  <option value="$appRoot/Apache/Pool/delete.vm">&nbsp;Delete&nbsp;</option>
+  #end
+  #if($User.isAllowed("RestartApache"))
+  <option value="$appRoot/Apache/Pool/restartapache.vm">&nbsp;Restart&nbsp;</option>
+  #end
+  #if($User.isAllowed("GracefulApache"))
+  <option value="$appRoot/Apache/Pool/gracefulapache.vm">&nbsp;Graceful&nbsp;</option>
+  #end
+  #if($User.isAllowed("StopApache"))
+  <option value="$appRoot/Apache/Pool/stopapache.vm">&nbsp;Stop&nbsp;</option>
+  #end
+  #if($User.isAllowed("StartApache"))
+  <option value="$appRoot/Apache/Pool/startapache.vm">&nbsp;Start&nbsp;</option>
+  #end
+  #if($User.isAllowed("ConfigtestApache"))
+  <option value="$appRoot/Apache/Pool/configtestapache.vm">&nbsp;Configtest&nbsp;</option>
+  #end
+  #if($User.isAllowed("ViewApachePool"))
+  <option value="$appRoot/Apache/Pool/viewconf.vm">&nbsp;View Apache Config&nbsp;</option>
+  #end
+  #if($User.isAllowed("ViewApachePool"))
+  <option value="$appRoot/Apache/Pool/viewprop.vm">&nbsp;View workers.properties&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeployApacheConfig"))
+  <option value="$appRoot/Apache/Pool/deployconf.vm">&nbsp;Deploy Apache Config&nbsp;</option>
+  #end
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/indiv.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/indiv.vm Thu Jul  6 08:23:21 2006
@@ -16,41 +16,41 @@
 ## $Id$
 ##
 <select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-#if($page)
-<option value="$appRoot/Apache/Pool/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#else
-<option value="$appRoot/Apache/Pool/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-#end
-#if($User.isAllowed("UpdateApachePool"))
-<option value="$appRoot/Apache/Pool/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
-#end
-#if($User.isAllowed("DeleteApachePool"))
-<option value="$appRoot/Apache/Pool/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
-#end
-#if($User.isAllowed("RestartApache"))
-<option value="$appRoot/Apache/Pool/restartapache.vm?id=$!{ent.getPk()}">&nbsp;Restart&nbsp;</option>
-#end
-#if($User.isAllowed("GracefulApache"))
-<option value="$appRoot/Apache/Pool/gracefulapache.vm?id=$!{ent.getPk()}">&nbsp;Graceful&nbsp;</option>
-#end
-#if($User.isAllowed("StopApache"))
-<option value="$appRoot/Apache/Pool/stopapache.vm?id=$!{ent.getPk()}">&nbsp;Stop&nbsp;</option>
-#end
-#if($User.isAllowed("StartApache"))
-<option value="$appRoot/Apache/Pool/startapache.vm?id=$!{ent.getPk()}">&nbsp;Start&nbsp;</option>
-#end
-#if($User.isAllowed("ConfigtestApache"))
-<option value="$appRoot/Apache/Pool/configtestapache.vm?id=$!{ent.getPk()}">&nbsp;Configtest&nbsp;</option>
-#end
-#if($User.isAllowed("ViewApachePool"))
-<option value="$appRoot/Apache/Pool/viewconf.vm">&nbsp;View Apache Config&nbsp;</option>
-#end
-#if($User.isAllowed("ViewApachePool"))
-<option value="$appRoot/Apache/Pool/viewprop.vm">&nbsp;View workers.properties&nbsp;</option>
-#end
-#if($User.isAllowed("DeployApacheConfig"))
-<option value="$appRoot/Apache/Pool/deployconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy Apache Config&nbsp;</option>
-#end
+  <option value="" selected>Select Action
+    #if($page)
+  <option value="$appRoot/Apache/Pool/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #else
+  <option value="$appRoot/Apache/Pool/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateApachePool"))
+  <option value="$appRoot/Apache/Pool/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteApachePool"))
+  <option value="$appRoot/Apache/Pool/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  #end
+  #if($User.isAllowed("RestartApache"))
+  <option value="$appRoot/Apache/Pool/restartapache.vm?id=$!{ent.getPk()}">&nbsp;Restart&nbsp;</option>
+  #end
+  #if($User.isAllowed("GracefulApache"))
+  <option value="$appRoot/Apache/Pool/gracefulapache.vm?id=$!{ent.getPk()}">&nbsp;Graceful&nbsp;</option>
+  #end
+  #if($User.isAllowed("StopApache"))
+  <option value="$appRoot/Apache/Pool/stopapache.vm?id=$!{ent.getPk()}">&nbsp;Stop&nbsp;</option>
+  #end
+  #if($User.isAllowed("StartApache"))
+  <option value="$appRoot/Apache/Pool/startapache.vm?id=$!{ent.getPk()}">&nbsp;Start&nbsp;</option>
+  #end
+  #if($User.isAllowed("ConfigtestApache"))
+  <option value="$appRoot/Apache/Pool/configtestapache.vm?id=$!{ent.getPk()}">&nbsp;Configtest&nbsp;</option>
+  #end
+  #if($User.isAllowed("ViewApachePool"))
+  <option value="$appRoot/Apache/Pool/viewconf.vm">&nbsp;View Apache Config&nbsp;</option>
+  #end
+  #if($User.isAllowed("ViewApachePool"))
+  <option value="$appRoot/Apache/Pool/viewprop.vm">&nbsp;View workers.properties&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeployApacheConfig"))
+  <option value="$appRoot/Apache/Pool/deployconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy Apache Config&nbsp;</option>
+  #end
 </select>
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm Thu Jul  6 08:23:21 2006
@@ -19,78 +19,72 @@
 #set ($pageSelected = "Pool")
 #parse("/layout/header.vm")
 <div align="center" class="contentbox">
-  <br/><br/>
+<br /><br />
 
-  <div class="projectbox">
-    <table width="100%" border="0" cellspacing="0" cellpadding="1">
-      <tr class="info" valign="top">
-        <td colspan="2">Infrastructure - <b>Apache Pool</b>
-        </td>
-        <td align="right">
-          #parse("/Apache/Pool/menu/global.vm")
-        </td>
-      </tr>
-    </table>
-    <br/>
-
-    <div class="messagebox">
-
-      #set ($id = $request.getParameter("id"))
-      #set ($methodToCall = "UpdateApachePool")
-
-      #if ($User.isAllowed("UpdateApachePool") && $methodToCall == "UpdateApachePool")
-      #if($id)
-      <br/>
-      #set ($apachePool = $view.getApachePool($id))
-      #set ($numberOfWorkers = $apachePool.getApaches().size())
-      <form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
-        <input type="hidden" id="poolId" name="poolId" value="$!{id}">
-        <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-
-        Pool Name: <input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}"><br/>
-
-        Environment:
-        #set ($envs = $view.getEnvironments())
-        <select name=envId>
-          ##if ($apachePool.getEnv())
-          ##if ($envs.remove($apachePool.getEnv()))
-
-          ##end
-          ##end
-          <option value="$apachePool.getEnv().getPk()">$apachePool.getEnv().getName()
-            #foreach ($env in $envs)
-          <option value="$env.getPk()">$env.getName()
-            #end
-        </select><BR>
-
-        ##Steve testing
-        <b>Apache Workers</b> - <A href="update.vm?id=$id&workers=$math.add($numberOfWorkers, 1)"> Add Worker</a><BR>
-
-        #foreach ($worker in $apachePool.getApaches())
-        $worker.getName() -
-        <A href="$appRoot/Apache/Worker/delete.vm?id=$worker.getPk()"> Delete</A> |
-        <A href="$appRoot/Apache/Worker/update.vm?id=$worker.getPk()"> Modify</A>
-
-        #end
-        <br/>
-        <br/>
-        <input type="submit" value="submit">
-      </form>
-      #else
-      Apache Pool:
-      #set ($aps = $view.getApachePools())
-      <select name=id onchange='OnChange(this);'>
-        <option value="">Select one
-          #foreach ($ap in $aps)
-        <option value="$appRoot/Apache/Pool/update.vm?id=$ap.getPk()">$ap.getName()
-          #end
-      </select><BR>
-      #end
-      #end
-    </div>
-    <br/>
-  </div>
-  <br/>
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+<tr class="info" valign="top">
+	<td colspan="2">Infrastructure - <b>Apache Pool</b>
+  </td>
+  <td align="right">
+  #parse("/Apache/Pool/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br /><div class="messagebox">
+
+#set ($id = $request.getParameter("id"))
+#set ($methodToCall = "UpdateApachePool")
+
+#if ($User.isAllowed("UpdateApachePool") && $methodToCall == "UpdateApachePool")
+#if($id)
+#set ($apachePool = $view.getApachePool($id))
+#set ($numberOfWorkers = $apachePool.getApaches().size())
+<form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
+<input type="hidden" id="poolId" name="poolId" value="$!{id}">
+<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+
+Pool Name: <input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}"><br />
+
+Environment:
+#set ($envs = $view.getEnvironments())
+<select name=envId>
+##if ($apachePool.getEnv())
+##if ($envs.remove($apachePool.getEnv()))
+
+##end
+##end
+            <option value="$apachePool.getEnv().getPk()">$apachePool.getEnv().getName()
+			      #foreach ($env in $envs)
+			      <option value="$env.getPk()">$env.getName()
+			      #end
+			      </select><BR>
+
+##Steve testing
+<b>Apache Workers</b> - <A href="update.vm?id=$id&workers=$math.add($numberOfWorkers, 1)"> Add Worker</a><BR>
+
+#foreach ($worker in $apachePool.getApaches())
+		 $worker.getName() -
+		 <A href="$appRoot/Apache/Worker/delete.vm?id=$worker.getPk()"> Delete</A> |
+		 <A href="$appRoot/Apache/Worker/update.vm?id=$worker.getPk()"> Modify</A>
+
+#end
+</form>
+#else
+  Apache Pool:
+  #set ($aps = $view.getApachePools())
+               <select name=id onchange='OnChange(this);'>
+                          <option value="">Select one
+              			      #foreach ($ap in $aps)
+              			      <option value="$appRoot/Apache/Pool/update.vm?id=$ap.getPk()">$ap.getName()
+              			      #end
+              			      </select><BR>
+#end
+#end
+</div>
+<br />
+</div>
+<br />
 </div>
 #parse("/layout/footer.vm")
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm Thu Jul  6 08:23:21 2006
@@ -23,42 +23,43 @@
 #set ($id = $request.getParameter("id"))
 #end
 <div align="center" class="contentbox">
-<br /><br />
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan="2">Infrastructure - <b>Apache Pool</b>
-  </td>
-  <td align="right">
-  #parse("Apache/Pool/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-##<div id="bigright">
-<div class="messagebox">
+  <br/><br/>
 
-#if ($id)
-#set ($apacheWorker = $view.getApacheWorker($id))
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan="2">Infrastructure - <b>Apache Pool</b>
+        </td>
+        <td align="right">
+          #parse("Apache/Pool/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+    ##<div id="bigright">
+    <div class="messagebox">
 
-<TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildConfForWeb()}</textarea>
+      #if ($id)
+      #set ($apacheWorker = $view.getApacheWorker($id))
 
-#else
-Apache Worker:
-#set ($aws = $view.getApacheWorkers())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($aw in $aws)
-              			      <option value="$appRoot/Apache/Pool/viewconf.vm?id=$aw.getPk()">$aw.getName()
-              			      #end
-              			      </select><BR>
-#end
+      <TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildConfForWeb()}</textarea>
 
-</div>
-<br />
-</div>
-<br />
-</div>
-#parse("/layout/footer.vm")
+      #else
+      Apache Worker:
+      #set ($aws = $view.getApacheWorkers())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($aw in $aws)
+        <option value="$appRoot/Apache/Pool/viewconf.vm?id=$aw.getPk()">$aw.getName()
+          #end
+      </select><BR>
+      #end
+
+    </div>
+    <br/>
+  </div>
+    <br/>
+  </div>
+  #parse("/layout/footer.vm")
 
 

Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm?rev=419579&r1=419578&r2=419579&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm Thu Jul  6 08:23:21 2006
@@ -20,48 +20,48 @@
 #parse("/layout/header.vm")
 
 
-
 #if ($request.getParameter("id"))
 #set ($id = $request.getParameter("id"))
 #end
 
 <div align="center" class="contentbox">
-<br /><br />
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
-	<td colspan="2">Infrastructure - <b>Apache Pool</b>
-  </td>
-  <td align="right">
-  #parse("Apache/Pool/menu/global.vm")
-  </td>
-</tr>
-</table>
-<br />
-##<div id="bigright">
-<div class="messagebox">
-
-#if ($id)
-#set ($apacheWorker = $view.getApacheWorker($id))
-
-<TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildWorkersProperties()}</textarea>
-
-#else
-Apache Worker:
-#set ($aws = $view.getApacheWorkers())
-               <select name=id onchange='OnChange(this);'>
-                          <option value="">Select one
-              			      #foreach ($aw in $aws)
-              			      <option value="$appRoot/Apache/Pool/viewprop.vm?id=$aw.getPk()">$aw.getName()
-              			      #end
-              			      </select><BR>
-#end
+  <br/><br/>
 
-</div>
-<br />
-</div>
-<br />
-</div>
-#parse("/layout/footer.vm")
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan="2">Infrastructure - <b>Apache Pool</b>
+        </td>
+        <td align="right">
+          #parse("Apache/Pool/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br/>
+    ##<div id="bigright">
+    <div class="messagebox">
+
+      #if ($id)
+      #set ($apacheWorker = $view.getApacheWorker($id))
+
+      <TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildWorkersProperties()}</textarea>
+
+      #else
+      Apache Worker:
+      #set ($aws = $view.getApacheWorkers())
+      <select name=id onchange='OnChange(this);'>
+        <option value="">Select one
+          #foreach ($aw in $aws)
+        <option value="$appRoot/Apache/Pool/viewprop.vm?id=$aw.getPk()">$aw.getName()
+          #end
+      </select><BR>
+      #end
+
+    </div>
+    <br/>
+  </div>
+    <br/>
+  </div>
+  #parse("/layout/footer.vm")
 
 



Mime
View raw message