From lokahi-commits-return-137-apmail-incubator-lokahi-commits-archive=incubator.apache.org@incubator.apache.org Thu Jul 06 15:24:15 2006 Return-Path: Delivered-To: apmail-incubator-lokahi-commits-archive@locus.apache.org Received: (qmail 20441 invoked from network); 6 Jul 2006 15:24:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Jul 2006 15:24:15 -0000 Received: (qmail 18372 invoked by uid 500); 6 Jul 2006 15:24:15 -0000 Delivered-To: apmail-incubator-lokahi-commits-archive@incubator.apache.org Received: (qmail 18307 invoked by uid 500); 6 Jul 2006 15:24:14 -0000 Mailing-List: contact lokahi-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lokahi-dev@incubator.apache.org Delivered-To: mailing list lokahi-commits@incubator.apache.org Received: (qmail 18239 invoked by uid 99); 6 Jul 2006 15:24:13 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 08:24:13 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 08:24:08 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 10B411A9823; Thu, 6 Jul 2006 08:23:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r419579 [4/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 -0000 To: lokahi-commits@incubator.apache.org From: toback@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060706152348.10B411A9823@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm Thu Jul 6 08:23:21 2006 @@ -20,123 +20,125 @@ #parse("/layout/header.vm")
-

+

+
- - - - + + + +
Infrastructure - Apache - - #parse("Apache/Server/menu/global.vm") -
Infrastructure - Apache + + #parse("Apache/Server/menu/global.vm") +
-
+
+
- - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + #end
-

-
-
-Name: - - - + Name: + + +
-Server Root: - - - + Server Root: + + +
-Log Location: - - - + Log Location: + + +
-System User: - - - + System User: + + +
-System Group: - - - + System Group: + + +
-Start Command: - - - + Start Command: + + +
-Stop Command: - - - + Stop Command: + + +
-Restart Command: - - - + Restart Command: + + +
-Fork Wait: - - - + Fork Wait: + + +
-Environment Variables: - - - + Environment Variables: + + +
-Pid File Location: - - - + Pid File Location: + + +
-Apache Main: - -#set ($allFiles = $view.getFiles()) + + Apache Main: + + #set ($allFiles = $view.getFiles()) - -
- - - - -
Infrastructure - Apache - - #parse("/Apache/Server/menu/global.vm") -
-
- - -#if ($id) - #set ($apache = $view.getApache($id)) - #set ($ent = $apache) - - - - - +

- - - - - - - - - +
+
- Apache - $!{apache.getName()} - -#if ($ent) -#parse("/Apache/Server/menu/indiv.vm") -#end -
Server Root:$!{apache.getServerRoot()}
Log Location:$!{apache.getLogLocation()}
System User:$!{apache.getSysUser()}
System Group:$!{apache.getSysGroup()}
Start Command:$!{apache.getStartCommand()}
Stop Command:$!{apache.getStopCommand()}
Restart Command:$!{apache.getRestartCommand()}
Environment Varibles:$!{apache.getEnvVaribles()}
Pid File Location:$!{apache.getPidFileLocation()}
+ + + + +
Infrastructure - Apache + + #parse("/Apache/Server/menu/global.vm") +
+
+ + + #if ($id) + #set ($apache = $view.getApache($id)) + #set ($ent = $apache) + + + + + + + + + + + + + + + -
+ Apache - $!{apache.getName()} + + #if ($ent) + #parse("/Apache/Server/menu/indiv.vm") + #end +
Server Root:$!{apache.getServerRoot()}
Log Location:$!{apache.getLogLocation()}
System User:$!{apache.getSysUser()}
System Group:$!{apache.getSysGroup()}
Start Command:$!{apache.getStartCommand()}
Stop Command:$!{apache.getStopCommand()}
Restart Command:$!{apache.getRestartCommand()}
Environment Varibles:$!{apache.getEnvVaribles()}
Pid File Location:$!{apache.getPidFileLocation()}
Apache Main: $!{apache.getMain().getDescriptor()}
+ -#set ($collection = $view.getApacheWorkers($apache)) -#if( $collection && ! $collection.isEmpty()) -
-#parse("/Apache/Worker/list.vm") -#end ## of all apaches - -#else -
- Apache: - #set ($aps = $view.getApaches()) -
-
-#end + #set ($collection = $view.getApacheWorkers($apache)) + #if( $collection && ! $collection.isEmpty()) +
+ #parse("/Apache/Worker/list.vm") + #end ## of all apaches + + #else +
+ Apache: + #set ($aps = $view.getApaches()) +
+
+ #end -
+
-
+
-#parse("/layout/footer.vm") + #parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm Thu Jul 6 08:23:21 2006 @@ -16,10 +16,10 @@ ## $Id$ ## Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm Thu Jul 6 08:23:21 2006 @@ -16,9 +16,9 @@ ## $Id$ ## Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/update.vm Thu Jul 6 08:23:21 2006 @@ -20,78 +20,68 @@ #parse("/layout/header.vm")
-

+

+
+ + + + + +
Infrastructure - Apache + + #parse("Apache/Server/menu/global.vm") +
+
+
+#set ($id = $request.getParameter("id")) +#set ($methodToCall = "UpdateApache") +#if($id) +#set ($apache = $view.getApache($id)) -
- - - - - -
Infrastructure - Apache - - #parse("Apache/Server/menu/global.vm") -
-
+#if ($User.isAllowed("UpdateApache") && $methodToCall == "UpdateApache") + + + +Name:
+Server Root:
+Log Location:
+System User:
+System Group:
+Start Command:
+Stop Command:
+Restart Command:
+Environment Varibles:
+ Pid File Location:
+Apache Main: +#set ($allFiles = $view.getFiles()) +#if ($apache.getMain()) +#if ($allfiles.remove($apache.getMain())) -
- #set ($id = $request.getParameter("id")) - #set ($methodToCall = "UpdateApache") - #if($id) - #set ($apache = $view.getApache($id)) - - #if ($User.isAllowed("UpdateApache") && $methodToCall == "UpdateApache") - - - - Name:
- Server Root: -
- Log Location:
- System User:
- System Group:
- Start Command: -
- Stop Command:
- Restart Command:
- Environment Varibles:
- Pid File Location:
- Apache Main: - #set ($allFiles = $view.getFiles()) - #if ($apache.getMain()) - #if ($allfiles.remove($apache.getMain())) - - #end - #end - -
-
-
- - #end - #else - Apache: - #set ($aps = $view.getApaches()) -
- #end -
-
-
-
+#end +#end + +
+ +#end +#else + Apache: + #set ($aps = $view.getApaches()) +
+#end +
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/viewconf.vm Thu Jul 6 08:23:21 2006 @@ -25,25 +25,25 @@ #end
-
+
-#if ($id) -#set ($apacheWorker = $view.getApacheWorker($id)) + #if ($id) + #set ($apacheWorker = $view.getApacheWorker($id)) - + -#else -Apache Worker: -#set ($aws = $view.getApacheWorkers()) -
-#end + #else + Apache Worker: + #set ($aws = $view.getApacheWorkers()) +
+ #end -
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/add.vm Thu Jul 6 08:23:21 2006 @@ -19,103 +19,104 @@ #set ($pageSelected = "ApachePool") #parse("/layout/header.vm")
-

+

-
- - - - - -
Infrastructure - ApacheWorker - - #parse("Apache/Worker/menu/global.vm") -
-
-
-#if ($request.getParameter("workers")) -#set($numberOfWorkers = $math.toInteger($request.getParameter("workers"))) -#else -#set($numberOfWorkers = 1) -#end - -#if ($request.getParameter("id")) -#set ($id = $request.getParameter("id")) -#end - - -Debug: Number of workers: $numberOfWorkers

- -
- - - - - - - - - - - - - - - - -#set($Apaches = $view.getApaches()) -#set($hardware = $view.getHardwares()) -#foreach($run in [1..$numberOfWorkers]) - - - - -#end -
-Pool Name: - -#if($id) -#set ($apachePool = $view.getApachePool($id)) - -#end - -
-Environment: - -#set ($envs = $view.getEnvironments()) - -
- Add another Apache Worker -
-Apache Container: - -Hardware: -
-$run - - - - -
- - -
-
-
-
-
+
+ + + + + +
Infrastructure - ApacheWorker + + #parse("Apache/Worker/menu/global.vm") +
+
+ +
+ #if ($request.getParameter("workers")) + #set($numberOfWorkers = $math.toInteger($request.getParameter("workers"))) + #else + #set($numberOfWorkers = 1) + #end + + #if ($request.getParameter("id")) + #set ($id = $request.getParameter("id")) + #end + + + Debug: Number of workers: $numberOfWorkers

+ +
+ + + + + + + + + + + + + + + + + #set($Apaches = $view.getApaches()) + #set($hardware = $view.getHardwares()) + #foreach($run in [1..$numberOfWorkers]) + + + + + #end +
+ Pool Name: + + #if($id) + #set ($apachePool = $view.getApachePool($id)) + + #end + +
+ Environment: + + #set ($envs = $view.getEnvironments()) + +
+ Add another Apache Worker +
+ Apache Container: + + Hardware: +
+ $run + + + + +
+ + +
+
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm Thu Jul 6 08:23:21 2006 @@ -17,11 +17,11 @@ ## #if ($User.isAllowed($function) && $methodToCall && $actionLink)
- -
-$methodToCall -   -$individual.getName() + +
+ $methodToCall +    + $individual.getName()
#end Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/details.vm Thu Jul 6 08:23:21 2006 @@ -26,116 +26,120 @@ #set ($id = $request.getParameter("id")) #end
-

+

+
- - - - - -
Infrastructure - Apache Worker - - #parse("/Apache/Worker/menu/global.vm") -
-
+ + + + + +
Infrastructure - Apache Worker + + #parse("/Apache/Worker/menu/global.vm") +
+
-#if ($id) + #if ($id) #set ($apacheWorker = $view.getApacheWorker($id)) #set ($ent = $apacheWorker) - - - - - - - - - - - - - - +
- Worker - $!{apacheWorker.getName()} - - -#if ($ent) -#parse("/Apache/Worker/menu/indiv.vm") -#end -
Apache$!{apacheWorker.getApache().getName()} - #set($ent = $apacheWorker.getApache()) - #if($ent) - #parse("/Apache/Server/menu/indiv.vm") - #end -
Hardware$!{apacheWorker.getHardware().getName()} - #set($ent = $apacheWorker.getHardware()) - #if($ent) - #parse("/Core/Server/menu/indiv.vm") - #end -
+ + + + + + + + + + + + +
+ Worker - $!{apacheWorker.getName()} + + + #if ($ent) + #parse("/Apache/Worker/menu/indiv.vm") + #end +
Apache$!{apacheWorker.getApache().getName()} + + #set($ent = $apacheWorker.getApache()) + #if($ent) + #parse("/Apache/Server/menu/indiv.vm") + #end +
Hardware$!{apacheWorker.getHardware().getName()} + + #set($ent = $apacheWorker.getHardware()) + #if($ent) + #parse("/Core/Server/menu/indiv.vm") + #end +
#set ($collection = $view.getApachePools($apacheWorker)) #if( $collection && ! $collection.isEmpty()) -
+
#parse("/Apache/Pool/list.vm") -#end ## of all apachepools +#end ## of all apachepools #set ($vhosts = $view.getVirtualHosts($User, $apacheWorker)) #if( $vhosts && ! $vhosts.isEmpty()) -
- +
+
- - + + - - - - + + + + #set($c = 1) - #foreach ($vhost in $vhosts) - #set ($count = 1) - - - - - - - #set ($count = $math.add($count, 1)) - #if ($c == 1) - #set($c=2) - #else - #set($c=1) - #end - #end ##of all servers for this context + #foreach ($vhost in $vhosts) + #set ($count = 1) + + + + + + + #set ($count = $math.add($count, 1)) + #if ($c == 1) + #set($c=2) + #else + #set($c=1) + #end + #end ##of all servers for this context
- Virtualhosts - - #parse("/Apache/Entity/menu/global.vm") - + Virtualhosts + + #parse("/Apache/Entity/menu/global.vm") +
Hostname Environment Apache Pool Hostname Environment Apache Pool
$!{vhost.getName()} $!{vhost.getEnv().getName()} - $!{vhost.getApachePool().getName()}
- 		- #set($ent = $vhost) - #parse("/Apache/Entity/menu/indiv.vm") -
$!{vhost.getName()} $!{vhost.getEnv().getName()} + $!{vhost.getApachePool().getName()} +
+ 		+ #set($ent = $vhost) + #parse("/Apache/Entity/menu/indiv.vm") +
-#end ## of all vhosts +#end ## of all vhosts #else
- Apache Worker: - #set ($aws = $view.getApacheWorkers().orderByName().values()) -
+ Apache Worker: + #set ($aws = $view.getApacheWorkers().orderByName().values()) +
#end Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/list.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/list.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/list.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/list.vm Thu Jul 6 08:23:21 2006 @@ -36,7 +36,6 @@ #end - #parse("/layout/list2.vm") #if($plf) #parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/global.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/global.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/global.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/global.vm Thu Jul 6 08:23:21 2006 @@ -16,35 +16,35 @@ ## $Id$ ## Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/indiv.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/indiv.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/indiv.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/menu/indiv.vm Thu Jul 6 08:23:21 2006 @@ -16,41 +16,41 @@ ## $Id$ ## Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/update.vm Thu Jul 6 08:23:21 2006 @@ -20,66 +20,67 @@ #parse("/layout/header.vm")
-

-
- - - - - -
Infrastructure - Apache Worker - - #parse("/Apache/Worker/menu/global.vm") -
-
+

-
+
+ + + + + +
Infrastructure - Apache Worker + + #parse("/Apache/Worker/menu/global.vm") +
+
-#set ($id = $request.getParameter("id")) -#set ($methodToCall = "UpdateApacheWorker") +
-#if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateApacheWorker") -#if($id) -#set ($aw = $view.getApacheWorker($id)) -
- - -Name:
+ #set ($id = $request.getParameter("id")) + #set ($methodToCall = "UpdateApacheWorker") -Apache: -#set($Apaches = $view.getApaches()) - -
-State:
-Hardware: -#set($hardware = $view.getHardwares()) - -
- -
-#else -Apache Worker: -#set ($aws = $view.getApacheWorkers()) -
-#end -#end -
-
-
-
+ #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateApacheWorker") + #if($id) + #set ($aw = $view.getApacheWorker($id)) +
+ + + Name:
+ + Apache: + #set($Apaches = $view.getApaches()) + +
+ State:
+ Hardware: + #set($hardware = $view.getHardwares()) + +
+ +
+ #else + Apache Worker: + #set ($aws = $view.getApacheWorkers()) +
+ #end + #end +
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewconf.vm Thu Jul 6 08:23:21 2006 @@ -24,40 +24,42 @@ #end
-

-
- - - - - -
Infrastructure - Apache Worker - - #parse("Apache/Worker/menu/global.vm") -
-
-
- -#if ($id) -#set ($apacheWorker = $view.getApacheWorker($id)) - - - -#else -Apache Worker: -#set ($aws = $view.getApacheWorkers()) -
-#end - -
-
-
-
+

+ +
+ + + + + +
Infrastructure - Apache Worker + + #parse("Apache/Worker/menu/global.vm") +
+
+ +
+ + #if ($id) + #set ($apacheWorker = $view.getApacheWorker($id)) + + + + #else + Apache Worker: + #set ($aws = $view.getApacheWorkers()) +
+ #end + +
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/viewprop.vm Thu Jul 6 08:23:21 2006 @@ -25,40 +25,42 @@ #end
-

-
- - - - - -
Infrastructure - Apache Worker - - #parse("Apache/Worker/menu/global.vm") -
-
-
- -#if ($id) -#set ($apacheWorker = $view.getApacheWorker($id)) - - - -#else -Apache Worker: -#set ($aws = $view.getApacheWorkers()) -
-#end - -
-
-
-
+

+ +
+ + + + + +
Infrastructure - Apache Worker + + #parse("Apache/Worker/menu/global.vm") +
+
+ +
+ + #if ($id) + #set ($apacheWorker = $view.getApacheWorker($id)) + + + + #else + Apache Worker: + #set ($aws = $view.getApacheWorkers()) +
+ #end + +
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm Thu Jul 6 08:23:21 2006 @@ -19,73 +19,72 @@ #set ($pageSelected = "Pool") #parse("/layout/header.vm")
-

+

-
- - - - -
Infrastructure - Tomcat Pool -
-
- #set ($id = $request.getParameter("id")) - #set ($methodToCall = "UpdateTomcatPool") - #if($id) -
- #set ($tomcatPool = $view.getTomcatPool($id)) +
+ + + + +
Infrastructure - Tomcat Pool +
+
+#set ($id = $request.getParameter("id")) +#set ($methodToCall = "UpdateTomcatPool") +#if($id) +#set ($tomcatPool = $view.getTomcatPool($id)) - #if ($User.isAllowed("UpdateTomcatPool") && $methodToCall == "UpdateTomcatPool") -
- - - Name:
- Pool Name:
- Environment: - #set ($envs = $view.getEnvironments()) - + +Name:
+Pool Name:
+Environment: +#set ($envs = $view.getEnvironments()) +
- Tomcat Workers: +#end +#end +
-
-
-
-
+ +

+#end +#else + Tomcat Pool: + #set ($aps = $view.getTomcatPools()) +
+#end + +
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm Thu Jul 6 08:23:21 2006 @@ -19,123 +19,124 @@ #set ($pageSelected = "Server") #parse("/layout/header.vm")
-

+

+
- - - - + + + +
Infrastructure - Tomcat - - #parse("Tomcat/Server/menu/global.vm") -
Infrastructure - Tomcat + + #parse("Tomcat/Server/menu/global.vm") +
- - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + -#if ($tomcat.getType() == 5) +
+ #set ($id = $request.getParameter("id")) + #set ($methodToCall = "UpdateTomcat") + + #if($id) + #set ($tomcat = $view.getTomcat($id)) + + #if ($User.isAllowed("UpdateTomcat") && $methodToCall == "UpdateTomcat") + + + Name:
+ Description:
+ + #if ($tomcat.getType() == 5) Version: 4.0.4 5.0.27 5.5.9
#elseif ($tomcat.getType() == 6) Version: 4.0.4 5.0.27 5.5.9
@@ -61,25 +63,25 @@ Java Home:
Environment Varibles:
Java Options:
- -
- -#end -#else - Tomcat: - #set ($aps = $view.getTomcats()) -
+ +
+ + #end + #else + Tomcat: + #set ($aps = $view.getTomcats()) +
-#end -
-
- -
+ #end + +
+ +
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/update.vm Thu Jul 6 08:23:21 2006 @@ -19,77 +19,78 @@ #set ($pageSelected = "Worker") #parse("/layout/header.vm")
-

+

+
+
-Name: - - - + Name: + + +
-Description: - - - + Description: + + +
-Version: - + + Version: + 4.0.4 5.0.27 5.5.9 -
-Base Location: - - - + Base Location: + + +
-Tomcat Home: - - - + Tomcat Home: + + +
-HTTP Port: - - - + HTTP Port: + + +
-System User: - - - + System User: + + +
-System Group: - - - + System Group: + + +
-Java Home: - - - + Java Home: + + +
-Standard Out Log: - - - + Standard Out Log: + + +
-Start Class: - - - + Start Class: + + +
-Environment Varibles: - - - + Environment Varibles: + + +
-Java Options: - - - + Java Options: + + +
+ + + + +
Infrastructure - TomcatWorker + + #parse("Tomcat/Worker/menu/global.vm") +
+
+
-
- - - - - -
Infrastructure - TomcatWorker - - #parse("Tomcat/Worker/menu/global.vm") -
-
+#set ($id = $request.getParameter("id")) +#set ($methodToCall = "UpdateTomcatWorker") -
+#if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateTomcatWorker") +#if($id) +#set ($tw = $view.getTomcatWorker($id)) +
+ + +Worker Name:
- #set ($id = $request.getParameter("id")) - #set ($methodToCall = "UpdateTomcatWorker") - - #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateTomcatWorker") - #if($id) - #set ($tw = $view.getTomcatWorker($id)) - - - - Worker Name:
- - Name:
- Tomcat: - #set($tomcats = $view.getTomcats()) - -
- State:
- - Hardware: - #set($hardware = $view.getHardwares()) - -
- -
- #else - Tomcat Worker: - #set ($tws = $view.getTomcatWorkers()) -
- #end - #end -
-
-
-
+Name:
+Tomcat: +#set($tomcats = $view.getTomcats()) +#set ($twpk = $tw.getTomcat()) + +
+State:
+ +Hardware: +#set($hardware = $view.getHardwares()) + +
+ + +#else +
+Tomcat Worker: +#set ($tws = $view.getTomcatWorkers()) +
+
+#end +#end +
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/layout/header.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/header.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/layout/header.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/layout/header.vm Thu Jul 6 08:23:21 2006 @@ -20,22 +20,19 @@ #parse("/layout/checksession.vm") - #set ($title = $props.get("application.title")) - $title - - - - +#set ($title = $props.get("application.title")) + $title + + + + #if($focus) - #else Modified: incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm?rev=419579&r1=419578&r2=419579&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/layout/list2.vm Thu Jul 6 08:23:21 2006 @@ -32,111 +32,110 @@ ## #if($plf) -
-

-#if ($request.getParameter("e")) -#set ($envId = $request.getParameter("e")) +
+

+ #if ($request.getParameter("e")) + #set ($envId = $request.getParameter("e")) + #end +
+ + + #if ($category) + + + +
$category - $entity + #else + Infrastructure - $entity + #end + #if($usesEnv == "true") +   + #foreach ($env in $view.getEnvironments()) + $env.getName()   + #end + All   + #end + + #parse("$path/menu/global.vm") +
+
#end -
- + + + +#if ($individual && $indivPage) +#parse($indivPage) +#else +#if ($User.isAllowed($function) && $methodToCall && $actionLink) + + + + #end + #set($c = 1) + + #if( $collection && ! $collection.isEmpty()) +
- #if ($category) - + #else + + + #end + + + + + + + #foreach ($ent in $collection) + #if (($usesEnv == "true" && (!$envId || $ent.getEnvId().toString() == $envId)) || ! $usesEnv || $usesEnv == "false") + + + - - -
$category - $entity - #else - Infrastructure - $entity - #end - #if($usesEnv == "true") -   - #foreach ($env in $view.getEnvironments()) - $env.getName()   + #if ($plf) + + $entity + + $entity + + #parse("$path/menu/global.vm") +
Name + #if($usesEnv == "true") + Environment + #end +
+ #if ($User.isAllowed($function) && $methodToCall) +    #end - All   + $!{ent.getName()} + #if($usesEnv == "true") + $!{ent.getEnv().getName()} #end - - #parse("$path/menu/global.vm") -
-
- #end - - - - #if ($individual && $indivPage) - #parse($indivPage) - #else - #if ($User.isAllowed($function) && $methodToCall && $actionLink) - - - - #end - #set($c = 1) - - #if( $collection && ! $collection.isEmpty()) - - - #if ($plf) - + + + #if ($c == 1) + #set($c=2) #else - - + #set($c=1) #end - - - - - - - #foreach ($ent in $collection) - #if (($usesEnv == "true" && (!$envId || $ent.getEnvId().toString() == $envId)) || ! $usesEnv || $usesEnv == - "false") - - - - - - #if ($c == 1) - #set($c=2) - #else - #set($c=1) - #end - #end ## of env - #end ## of for + #end ## of env + #end ## of for
- $entity + #parse("$path/menu/indiv.vm") +
- $entity - - #parse("$path/menu/global.vm") -
Name - #if($usesEnv == "true") - Environment - #end -
- #if ($User.isAllowed($function) && $methodToCall) -    - #end - $!{ent.getName()} - #if($usesEnv == "true") - $!{ent.getEnv().getName()} - #end - - #parse("$path/menu/indiv.vm") -
- #else - No $entity to display.
-
- #end ## end of IF collection. - #if ($User.isAllowed($function) && $methodToCall && $actionLink) + #else + No $entity to display.
+
+ #end ## end of IF collection. + #if ($User.isAllowed($function) && $methodToCall && $actionLink) - - #end + #end - #if($plf) -
+#end +#if($plf) +
-
+
#end