From lokahi-commits-return-127-apmail-incubator-lokahi-commits-archive=incubator.apache.org@incubator.apache.org Wed Jul 05 21:12:36 2006 Return-Path: Delivered-To: apmail-incubator-lokahi-commits-archive@locus.apache.org Received: (qmail 93342 invoked from network); 5 Jul 2006 21:12:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Jul 2006 21:12:36 -0000 Received: (qmail 83339 invoked by uid 500); 5 Jul 2006 21:12:35 -0000 Delivered-To: apmail-incubator-lokahi-commits-archive@incubator.apache.org Received: (qmail 83283 invoked by uid 500); 5 Jul 2006 21:12:35 -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 83239 invoked by uid 99); 5 Jul 2006 21:12:34 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jul 2006 14:12:34 -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; Wed, 05 Jul 2006 14:12:27 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4690F1A9820; Wed, 5 Jul 2006 14:12:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r419344 [3/7] - in /incubator/lokahi/lokahi/trunk: ./ conf/ database/ docs/ src/java/org/apache/lokahi/core/agent/ src/java/org/apache/lokahi/core/agent/dao/ src/java/org/apache/lokahi/core/agent/job/ src/java/org/apache/lokahi/core/agent/r... Date: Wed, 05 Jul 2006 21:11:36 -0000 To: lokahi-commits@incubator.apache.org From: toback@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060705211207.4690F1A9820@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/Core/File/details.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/File/details.vm Wed Jul 5 14:11:29 2006 @@ -19,73 +19,74 @@ #set ($pageSelected = "file") #parse("/layout/header.vm")
-

+

-
- - - - - -
Administration - File - - #parse("Core/File/menu/global.vm") -
-
-
- -#set ($id = $request.getParameter("id")) -#set ($methodToCall = "UpdateFile") - -#if($id) -#set ($file = $view.getFile($id)) - -#if ($User.isAllowed("ViewFile"))
-Name: "$!{file.getName()}"
-Path: "$!{file.getPath()}"
-Descriptor: "$!{file.getDescriptor()}"
-Content:
-#end - -#if ($User.isAllowed("UpdateFile")) -

Update this File  

-#end - -#if ($User.isAllowed("DeleteFile")) -
- - - #submit_button("Submit" "Delete" "button" "") -
-#end - -#else -File: -#set ($files = $view.getFiles()) -
- -#end -
-
-
-
+
+ + + + + +
Administration - File + + #parse("Core/File/menu/global.vm") +
+
+ +
+ + #set ($id = $request.getParameter("id")) + #set ($methodToCall = "UpdateFile") + + #if($id) + #set ($file = $view.getFile($id)) + + #if ($User.isAllowed("ViewFile"))
+ Name: "$!{file.getName()}"
+ Path: "$!{file.getPath()}"
+ Descriptor: "$!{file.getDescriptor()}"
+ Content:
+ #end + + #if ($User.isAllowed("UpdateFile")) +

Update this File  

+ #end + + #if ($User.isAllowed("DeleteFile")) +
+ + + #submit_button("Submit" "Delete" "button" "") +
+ #end + + #else + File: + #set ($files = $view.getFiles()) +
+ + #end +
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/File/list.vm Wed Jul 5 14:11:29 2006 @@ -16,18 +16,17 @@ ## $Id$ ## #if (!$collection) - #set ($menu = "/layout/menu/EntityTop.vm") - #set ($pageSelected = "file") - #parse("/layout/header.vm") - - #set ($plf = "true") - #if ($request.getParameter("id")) - #set ($id = $request.getParameter("id")) - #set ($individual = $view.getFile($id)) - #set ($indivPage = "/Core/File/confirm.vm") - #else - #set ($collection = $view.getFiles()) - #end +#set ($menu = "/layout/menu/EntityTop.vm") +#set ($pageSelected = "file") +#parse("/layout/header.vm") +#set ($plf = "true") +#if ($request.getParameter("id")) +#set ($id = $request.getParameter("id")) +#set ($individual = $view.getFile($id)) +#set ($indivPage = "/Core/File/confirm.vm") +#else +#set ($collection = $view.getFiles()) +#end #end #set ($entity = "File") #set ($usesEnv = "false") @@ -35,73 +34,63 @@ #set ($addFunction = "Add$entity") #set ($deleteFunction = "Delete$entity") #if (! $currentPage) - #set ($currentPage = "$appRoot/Core/File/list.vm") +#set ($currentPage = "$appRoot/Core/File/list.vm") #end #parse("/layout/list2.vm") #if ($plf) - #parse("/layout/footer.vm") +#parse("/layout/footer.vm") #end - - - - - - - - - - - - ##
-##

+ ##

-##
-## -## -## -## -## -##
Administration - File -## -## #parse("Core/File/menu/global.vm") -##
-##
-##
-## -## -## -###if ($User.isAllowed($addFunction)) -## Add -###end -###if ($User.isAllowed($deleteFunction)) -##
-## -###end -##
    -###if ($collection.isEmpty()) -## No $entity to list. -###end -###foreach($item in $collection) -##
  • -## #if ($User.isAllowed($deleteFunction)) -##    -## #end -## $item.getName() - $!{item.getDescriptor()}
    • -###end -##
-###if ($User.isAllowed($deleteFunction)) -## -##
-###end -##
-##
-##
-##
-##
+ ##
+ ## + + ## + ## + ## + ## + ##
Administration - File + ## + ## #parse("Core/File/menu/global.vm") + ##
+ ##
+ ##
+ ## + ## + ## + ###if ($User.isAllowed($addFunction)) + ## Add + ###end + ###if ($User.isAllowed($deleteFunction)) + ## +
+ ## + ###end + ##
    + ###if ($collection.isEmpty()) + ## No $entity to list. + ###end + ###foreach($item in $collection) + ##
  • + ## #if ($User.isAllowed($deleteFunction)) + ##    + ## #end + ## $item.getName() - $!{item.getDescriptor()}
    • + ###end + ##
+ ###if ($User.isAllowed($deleteFunction)) + ## + ##
+ ###end + ##
+ ##
+ ##
+ ##
+ ## ###parse("/layout/footer.vm") ## ## Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/global.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/global.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/global.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/global.vm Wed Jul 5 14:11:29 2006 @@ -16,20 +16,20 @@ ## $Id$ ## Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/indiv.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/indiv.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/indiv.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/File/menu/indiv.vm Wed Jul 5 14:11:29 2006 @@ -16,17 +16,17 @@ ## $Id$ ## Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/File/update.vm Wed Jul 5 14:11:29 2006 @@ -19,66 +19,67 @@ #set ($pageSelected = "file") #parse("/layout/header.vm")
-

+

-
- - - - - -
Administration - File - - #parse("Core/File/menu/global.vm") -
-
-
- -#set ($id = $request.getParameter("id")) -#set ($methodToCall = "UpdateFile") - -#if($id) -#set ($file = $view.getFile($id)) -#if ($User.isAllowed("UpdateFile") && $methodToCall == "UpdateFile") -
- - - -Name:
-Path:
-Descriptor:
-Content:
- -
-#end - -#else -File: -#set ($files = $view.getFiles()) -
- -#end -
-
-
-
+
+ + + + + +
Administration - File + + #parse("Core/File/menu/global.vm") +
+
+ +
+ + #set ($id = $request.getParameter("id")) + #set ($methodToCall = "UpdateFile") + + #if($id) + #set ($file = $view.getFile($id)) + #if ($User.isAllowed("UpdateFile") && $methodToCall == "UpdateFile") +
+ + + + Name:
+ Path:
+ Descriptor:
+ Content:
+ +
+ #end + + #else + File: + #set ($files = $view.getFiles()) +
+ + #end +
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Function/add.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Function/add.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Function/add.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Function/add.vm Wed Jul 5 14:11:29 2006 @@ -19,30 +19,30 @@ #set ($pageSelected = "function") #parse("/layout/header.vm")
-
-
- - - - - - - - - -
-Name: - - -
-Function Command: - - -
- - -
-
+
+
+ + + + + + + + + +
+ Name: + + +
+ Function Command: + + +
+ + +
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Function/details.vm Wed Jul 5 14:11:29 2006 @@ -19,44 +19,44 @@ #set ($pageSelected = "function") #parse("/layout/header.vm")
-
- -#set ($id = $request.getParameter("id")) -#set ($methodToCall = "UpdateFunction") - -#if($id) - - -#set ($Function = $view.getFunction($id)) -Name: $!{Function.getName()}
-Function Command: $!{Function.getCommand()}
- - -#else -Function: -#set ($functions = $User.getFunctions()) -
+
+ + #set ($id = $request.getParameter("id")) + #set ($methodToCall = "UpdateFunction") + + #if($id) + + + #set ($Function = $view.getFunction($id)) + Name: $!{Function.getName()}
+ Function Command: $!{Function.getCommand()}
+ + + #else + Function: + #set ($functions = $User.getFunctions()) +
-#end -
+ #end +
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Function/update.vm Wed Jul 5 14:11:29 2006 @@ -19,50 +19,51 @@ #set ($pageSelected = "function") #parse("/layout/header.vm")
-
- - - -#set ($id = $request.getParameter("id")) -#set ($methodToCall = "UpdateFunction") -#if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateFunction") -#if($id) -#set ($Function = $view.getFunction($id)) -
- - - -Name:
-Function Command:
- - - -
-#else -Function: -#set ($functions = $User.getFunctions()) -
- -#end -#end -
+
+ + + + #set ($id = $request.getParameter("id")) + #set ($methodToCall = "UpdateFunction") + #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateFunction") + #if($id) + #set ($Function = $view.getFunction($id)) +
+ + + + Name:
+ Function Command:
+ + + +
+ #else + Function: + #set ($functions = $User.getFunctions()) +
+ + #end + #end +
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/add.vm Wed Jul 5 14:11:29 2006 @@ -19,46 +19,47 @@ #set ($pageSelected = "instance") #parse("/layout/header.vm")
-

+

-
- - - - - -
Infrastructure - Instance - - #parse("Core/Instance/menu/global.vm") -
-
-
-
- - - - - - - - - -
-Name: - - -
-Comments: - - -
- - -
-
-
-
-
+
+ + + + + +
Infrastructure - Instance + + #parse("Core/Instance/menu/global.vm") +
+
+ +
+
+ + + + + + + + + +
+ Name: + + +
+ Comments: + + +
+ + +
+
+
+
+
#parse("/layout/footer.vm") Added: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm?rev=419344&view=auto ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm (added) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm Wed Jul 5 14:11:29 2006 @@ -0,0 +1,31 @@ +## +## Copyright 2006 The Apache Software Foundation +## +## Licensed under the Apache License, Version 2.0 (the "License"); +## you may not use this file except in compliance with the License. +## You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## +## $Id$ +## +
+ +#if ($User.isAllowed($function) && $methodToCall && $actionLink) +
+
+ +
+
+$methodToCall +   +$individual.getName() +
+#end +
Propchange: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm ------------------------------------------------------------------------------ svn:keywords = Id Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/details.vm Wed Jul 5 14:11:29 2006 @@ -19,75 +19,77 @@ #set ($pageSelected = "instance") #parse("/layout/header.vm")
-

+

-
- - - - - -
Infrastructure - Instance - - #parse("Core/Instance/menu/global.vm") -
-
-
- - - -#set ($id = $request.getParameter("id")) -#set ($methodToCall = "UpdateInstance") - - -#if($id) - -#if ($User.isAllowed("ViewInstance") && $methodToCall == "UpdateInstance") -#set ($instance = $view.getInstance($id)) -Name: $!{instance.getName()}
-Comments:
-#end - -#if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateInstance") -Update this Instance  

-#end - -#if ($User.isAllowed("DeleteInstance")) -
- - - -
-#end - - -#else -Instance: -#set ($insts = $view.getInstances()) -
-#end - -
-
-
-
+
+ + + + + +
Infrastructure - Instance + + #parse("Core/Instance/menu/global.vm") +
+
+ +
+ + + + #set ($id = $request.getParameter("id")) + #set ($methodToCall = "UpdateInstance") + + + #if($id) + + #if ($User.isAllowed("ViewInstance") && $methodToCall == "UpdateInstance") + #set ($instance = $view.getInstance($id)) + Name: $!{instance.getName()}
+ Comments: +
+ #end + + #if ($User.isAllowed($methodToCall) && $methodToCall == "UpdateInstance") + Update this Instance  

+ #end + + #if ($User.isAllowed("DeleteInstance")) +
+ + + +
+ #end + + + #else + Instance: + #set ($insts = $view.getInstances()) +
+ #end + +
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/global.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/global.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/global.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/global.vm Wed Jul 5 14:11:29 2006 @@ -16,20 +16,20 @@ ## $Id$ ## Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/indiv.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/indiv.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/indiv.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/menu/indiv.vm Wed Jul 5 14:11:29 2006 @@ -16,20 +16,20 @@ ## $Id$ ## Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/update.vm Wed Jul 5 14:11:29 2006 @@ -19,65 +19,66 @@ #set ($pageSelected = "instance") #parse("/layout/header.vm")
-

+

-
- - - - - -
Infrastructure - Instance - - #parse("Core/Instance/menu/global.vm") -
-
-
- - - -#set ($id = $request.getParameter("id")) -#set ($methodToCall = "UpdateInstance") - - -#if($id) -#if ($User.isAllowed("UpdateInstance") && $methodToCall == "UpdateInstance") -#set ($instance = $view.getInstance($id)) -
- - - -Name:
-Comments:
- -
-#end -#else -Instance: -#set ($insts = $view.getInstances()) -
-#end -
-
-
-
+
+ + + + + +
Infrastructure - Instance + + #parse("Core/Instance/menu/global.vm") +
+
+ +
+ + + + #set ($id = $request.getParameter("id")) + #set ($methodToCall = "UpdateInstance") + + + #if($id) + #if ($User.isAllowed("UpdateInstance") && $methodToCall == "UpdateInstance") + #set ($instance = $view.getInstance($id)) +
+ + + + Name:
+ Comments:
+ +
+ #end + #else + Instance: + #set ($insts = $view.getInstances()) +
+ #end +
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Ip/add.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Ip/add.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Ip/add.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Ip/add.vm Wed Jul 5 14:11:29 2006 @@ -19,22 +19,22 @@ #set ($pageSelected = "Administration") #parse("/layout/header.vm")
-
-
- - - - - -
-Ip: - - -
- - -
-
+
+
+ + + + + +
+ Ip: + + +
+ + +
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Ip/details.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Ip/details.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Ip/details.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Ip/details.vm Wed Jul 5 14:11:29 2006 @@ -19,24 +19,24 @@ #set ($pageSelected = "Administration") #parse("/layout/header.vm")
-
+
-#set ($id = $request.getParameter("id")) -#set ($methodToCall = "UpdateIp") -#set ($Ip = $view.getIp($id)) + #set ($id = $request.getParameter("id")) + #set ($methodToCall = "UpdateIp") + #set ($Ip = $view.getIp($id)) -#if ($User.isAllowed("UpdateIp") && $methodToCall == "UpdateIp") -
- - + #if ($User.isAllowed("UpdateIp") && $methodToCall == "UpdateIp") + + + -Ip: + Ip: - + -
-#end -
+ + #end +
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/details.vm Wed Jul 5 14:11:29 2006 @@ -21,84 +21,85 @@ #set ($jobPoolId = $request.getParameter("Id"))
-

- - - - - -
-
- #submit_button("submit" "< Back" "button" "") -
- 		-
- - #submit_button("Submit" " Refresh " "button" "") -
-
- -
- -##get recent jobs. - - #set ($jobPool = $view.getJobPool($jobPoolId) ) - - - - - - - - #if($jobPool.getProject()) - - #else - - #end - - - - - - - - - - - - - - - - - - - - - - #set ($sortedJobs = $jobPool.getSortedJobs()) - #foreach ($hardwareName in $sortedJobs.keySet()) - - - - - - - - +

+
Job details for Job ID - $jobPool.getName()
Project Name $!{jobPool.getProject().getName()}
Job $jobPool.getFunction().getName()
User $jobPool.getUser().getName()
Start Time $jobPool.getStartTime()
Finish Time $!{jobPool.getFinishTime()}
Options $!{jobPool.getOptions()}
 
Details for Server - $hardwareName
Job NameJob StateJob Result
+ + + + +
+
+ #submit_button("submit" " +
+ + + #submit_button("Submit" " Refresh " "button" "") + +
+ +
+ + ##get recent jobs. + + #set ($jobPool = $view.getJobPool($jobPoolId) ) + + + + + + + + #if($jobPool.getProject()) + + #else + + #end + + + + + + + + + + + + + + + + + + + + + + #set ($sortedJobs = $jobPool.getSortedJobs()) + #foreach ($hardwareName in $sortedJobs.keySet()) + + + + + + + + #foreach ($Job in $sortedJobs.get($hardwareName).values()) - - - - - - #end - #end + + + + + + #end + #end -
Job details for Job ID - $jobPool.getName()
Project Name $!{jobPool.getProject().getName()} +
Job $jobPool.getFunction().getName()
User $jobPool.getUser().getName()
Start Time $jobPool.getStartTime()
Finish Time $!{jobPool.getFinishTime()}
Options $!{jobPool.getOptions()}
 
Details for Server - $hardwareName
Job NameJob StateJob Result
$Job.getName() - $Job.getFunction().getCommand() - $Job.getState().getName() - #if($Job.getState().getPk() > 3) $Job.getResult().replaceAll("\n","
") #end
$Job.getName() - $Job.getFunction().getCommand() + $Job.getState().getName() + #if($Job.getState().getPk() > 3) $Job.getResult().replaceAll("\n","
") #end
-
+ +
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/recent.vm Wed Jul 5 14:11:29 2006 @@ -24,82 +24,84 @@ #set ($numToShow = 10) #end
-

+

-
- - - - - - -
My Recent Jobs - #foreach ($num in [10,20,30]) -  $num   - #end -   - -
- #submit_button("Submit" " Refresh " "button" "") -
- 		- Search Jobs    -
- - -#messagesMarkup() -#errorMarkup() -#if ($ErrorMessage) - $!ErrorMessage -#end -$!ResultMessage -
- -##get recent jobs. -#set ($recentJobs = $User.getRecentJobPools($numToShow)) - - - - - - - -#if(!$recentJobs || $recentJobs.isEmpty()) - -#else - #set($c=1) - #foreach($job in $recentJobs) - - - - - - - - #if ($c == 1) +
+
ProjectActionTimeStatus
No recent jobs for $User.getName() - $User.getFirstName() $User.getLastName()
- #if($job.getProject()) - $!{job.getProject().getName()} - #end - $job.getFunction().getName() $job.getStartTime() - #if($job.getState().getName()) - - Details - #else - Details - #end - -
+ + + + + +
My Recent Jobs + #foreach ($num in [10,20,30]) +  $num   + #end +   + +
+ #submit_button("Submit" " Refresh " "button" "") +
+ 		+ Search Jobs    +
+ + + #messagesMarkup() + #errorMarkup() + #if ($ErrorMessage) + $!ErrorMessage + #end + $!ResultMessage +
+ + ##get recent jobs. + #set ($recentJobs = $User.getRecentJobPools($numToShow)) + + + + + + + + #if(!$recentJobs || $recentJobs.isEmpty()) + + #else + #set($c=1) + #foreach($job in $recentJobs) + + + + + + + + #if ($c == 1) #set($c=2) - #else + #else #set($c=1) - #end - #end -#end -
ProjectActionTimeStatus
No recent jobs for $User.getName() - $User.getFirstName() + $User.getLastName()
+ #if($job.getProject()) + $!{job.getProject().getName()} + #end + $job.getFunction().getName() $job.getStartTime() + #if($job.getState().getName()) + + Details + #else + Details + #end + +
-
-
+ #end + #end + #end + +
+
-
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/running.vm Wed Jul 5 14:11:29 2006 @@ -20,36 +20,34 @@ #parse("/layout/header.vm") - -
-

+

- +
- #set ($sortedJobs = $view.getRunningJobs()) - #foreach ($hardwareName in $sortedJobs.keySet()) + #set ($sortedJobs = $view.getRunningJobs()) + #foreach ($hardwareName in $sortedJobs.keySet()) - - - - - - - + + + + + + + #foreach ($Job in $sortedJobs.get($hardwareName).values()) - - - - - - #end - #end + + + + + + #end + #end -
 
Details for Server - $hardwareName
Job NameJob StateJob StartTime
 
Details for Server - $hardwareName
Job NameJob StateJob StartTime
$Job.getName() - $Job.getFunction().getCommand() - $Job.getState().getName() - $Job.getStartTime()
$Job.getName() - $Job.getFunction().getCommand() + $Job.getState().getName() + $Job.getStartTime()
+ -
+
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/JobPool/search.vm Wed Jul 5 14:11:29 2006 @@ -20,9 +20,9 @@ #parse("/layout/header.vm")
-

+

#if($filter || $StartDate || $EndDate || $userId || $functions) -#set($results = $view.getJobPools($userId, $filter, $StartDate, $EndDate, $functions)) +#set($results = $view.getJobPools($userId, $filter, $StartDate, $EndDate, $functions)) #end #tooltippopup("StartDatePopBox" "
    Format for the start date:
  • MM/DD/YY
  • MM/DD/YY HH:MM
") @@ -32,123 +32,113 @@
- - - - + + + - + +
Search Jobs - -
- - - - - #foreach($f in $functions) - - #end - #submit_button("Submit" " Refresh " "button" "") -
- 		+
Search Jobs + +
+ + + + + #foreach($f in $functions) + + #end + #submit_button("Submit" " Refresh " "button" "") +
+ 		Back to My Jobs -

#if ($results) - - - - - - - -#if(!$results || $results.isEmpty()) - -#else + + + + + + + + #if(!$results || $results.isEmpty()) + + #else #set($c=1) - #foreach($job in $results) - + #foreach($job in $results) + - - - - - - - #if ($c == 1) - #set($c=2) - #else - #set($c=1) - #end - #end -#end + + + + + + + #if ($c == 1) + #set($c=2) + #else + #set($c=1) + #end + #end + #end
ProjectUserActionTimeStatus
No jobs fit your search results.
ProjectUserActionTimeStatus
No jobs fit your search results.
- #if($job.getProject()) - $!{job.getProject().getName()} - #end - $!{job.getUser().getFullName()} $job.getFunction().getName() $job.getStartTime() - #if($job.getState().getName()) - $job.getState().getName() - #else - Details - #end - -
+ #if($job.getProject()) + $!{job.getProject().getName()} + #end + $!{job.getUser().getFullName()} $job.getFunction().getName() $job.getStartTime() + #if($job.getState().getName()) + $job.getState().getName() + #else + Details + #end + +

#end -
-
-
- - - - -#set ($users = $view.getUsers()) - - + +
Filter:
Date Range:  #anchortippopup("StartDatePopBox" "$appRoot/Help/index.vm")
 to:  #anchortippopup("EndDatePopBox" "$appRoot/Help/index.vm")
User:  #anchortippopup("UserPopBox" "$appRoot/Help/index.vm")
Function: -
+
+ + + + + + + #set ($users = $view.getUsers()) + + - -
Filter:
Date Range:  #anchortippopup("StartDatePopBox" + "$appRoot/Help/index.vm")
 to: #anchortippopup("EndDatePopBox" + "$appRoot/Help/index.vm")
User:  #anchortippopup("UserPopBox" "$appRoot/Help/index.vm")
Function: +  #anchortippopup("FunctionPopBox" "$appRoot/Help/index.vm")
#submit_button("Submit" "Search" "button" "")
+  #anchortippopup("FunctionPopBox" "$appRoot/Help/index.vm")
#submit_button("Submit" "Search" "button" "")
-
-
-
+ +
+

- - - - -
+
-
- - - - - - - - - - +
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm Wed Jul 5 14:11:29 2006 @@ -19,78 +19,79 @@ #set ($pageSelected = "Pool") #parse("/layout/header.vm")
-

+

-
- - - - -
Infrastructure - Hosting Pool -
-
-
- -
- - - - - - - - - - - - - - - - - -
-Name: - - -
-TomcatPool: - -#set ($tps = $view.getTomcatPools()) - - -
-Apache Pool: - -#set ($aps = $view.getApachePools()) - - -
-Environment: - -#set ($envs = $view.getEnvironments()) - - -
- - -
-
-
-
-
+
+ + + + +
Infrastructure - Hosting Pool +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + +
+ Name: + + +
+ TomcatPool: + + #set ($tps = $view.getTomcatPools()) + + +
+ Apache Pool: + + #set ($aps = $view.getApachePools()) + + +
+ Environment: + + #set ($envs = $view.getEnvironments()) + + +
+ + +
+
+
+
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/confirm.vm Wed Jul 5 14:11:29 2006 @@ -15,14 +15,18 @@ ## ## $Id$ ## - -#if ($User.isAllowed($function) && $methodToCall && $actionLink) -
- -
-$methodToCall -   -$individual.getName() -
-#end +
+ + #if ($User.isAllowed($function) && $methodToCall && $actionLink) +
+
+ +
+
+ $methodToCall +    + $individual.getName() +
+ #end +
\ No newline at end of file Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/details.vm Wed Jul 5 14:11:29 2006 @@ -21,190 +21,195 @@ #set ($id = $request.getParameter("id")) #set ($methodToCall = "UpdateHostingPool")
-

+

+
- - - - + + + +
Infrastructure - Hosting Pool - - #parse("Core/Pool/menu/global.vm") -
Infrastructure - Hosting Pool + + #parse("Core/Pool/menu/global.vm") +
-
+
#if ($id) #set ($ent = $view.getHostingPool($id)) #set ($hp = $ent) #end #if ($hp) - +
- - + + - - + + - - + + - + -
Hosting Pool - #if ($hp) - - $hp.getName() - #end - - #if($ent) - #parse("/Core/Pool/menu/indiv.vm") - #else - #parse("/Core/Pool/menu/global.vm") - #end - Hosting Pool + #if ($hp) + - $hp.getName() + #end + + #if($ent) + #parse("/Core/Pool/menu/indiv.vm") + #else + #parse("/Core/Pool/menu/global.vm") + #end +
Apache Pool:$!{hp.getApachePool().getName()} - #set($ent = $hp.getApachePool()) - #if ($ent) - #parse("/Apache/Pool/menu/indiv.vm") - #end -
Apache Pool:$!{hp.getApachePool().getName()} + + #set($ent = $hp.getApachePool()) + #if ($ent) + #parse("/Apache/Pool/menu/indiv.vm") + #end +
Tomcat Pool:$!{hp.getTomcatPool().getName()} - #set($ent = $hp.getTomcatPool()) - #if ($ent) - #parse("/Tomcat/Pool/menu/indiv.vm") - #end -
Tomcat Pool:$!{hp.getTomcatPool().getName()} + + #set($ent = $hp.getTomcatPool()) + #if ($ent) + #parse("/Tomcat/Pool/menu/indiv.vm") + #end +
Environment:$!{hp.getEnv().getName()} Environment:$!{hp.getEnv().getName()} +
- - - #set ($apachePool = $hp.getApachePool()) - #set ($vhosts = $view.getVirtualHosts($User, $apachePool)) + + + +#set ($apachePool = $hp.getApachePool()) +#set ($vhosts = $view.getVirtualHosts($User, $apachePool)) #if( $vhosts && ! $vhosts.isEmpty())
- +
- - - + + + - - - #set($c = 1) - #foreach ($vhost in $vhosts) - #set ($count = 1) - - - - - + +#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 + + #end + + +#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 - -
+ Virtualhosts + +
Hostname Environment Worker
$!{vhost.getName()} $!{vhost.getEnv().getName()} - #foreach ($apacheWorker in $apachePool.getApaches()) - $!{apacheWorker.getName()}
- #end - 		- #if ($User.isAllowed("AddContext") || $User.isAllowed("DeleteVirtualHost", $vhost) || $User.isAllowed("ViewVirtualHost", $vhost) || $User.isAllowed("UpdateVirtualHost", $vhost)) -
$!{vhost.getName()} $!{vhost.getEnv().getName()} + #foreach ($apacheWorker in $apachePool.getApaches()) + $!{apacheWorker.getName()}
+ #end + 		+ #if ($User.isAllowed("AddContext") || $User.isAllowed("DeleteVirtualHost", $vhost) || + $User.isAllowed("ViewVirtualHost", $vhost) || $User.isAllowed("UpdateVirtualHost", $vhost)) + - #end -
-#end ## of all contexts +#end ## of all contexts #set ($tomcatPool = $hp.getTomcatPool()) #set ($projectContexts = $view.getTomcatContexts($User, $tomcatPool)) #if( $projectContexts && ! $projectContexts.isEmpty())
- +
- - - + + + - - - #set($c = 1) - #foreach ($context in $projectContexts) - #set ($count = 1) - #set ($tomcatPool = $context.getTomcatPool()) - #if (!$context.hasTomcatPool()) - - - - - #else - - - - #end - - - - #set ($count = $math.add($count, 1)) - #if ($c == 1) - #set($c=2) - #else - #set($c=1) - #end - #end ##of all servers for this context + + +#set($c = 1) +#foreach ($context in $projectContexts) +#set ($count = 1) +#set ($tomcatPool = $context.getTomcatPool()) +#if (!$context.hasTomcatPool()) + + + + +#else + + + + #end + + + +#set ($count = $math.add($count, 1)) +#if ($c == 1) +#set($c=2) +#else +#set($c=1) +#end +#end ##of all servers for this context
- Tomcat applications - -
+ Tomcat applications + +
Context Environment Worker
$!{context.getName()} $!{context.getEnv().getName()} Not assigned to a Pool
$!{context.getName()} $!{context.getEnv().getName()} - #foreach ($tomcatWorker in $tomcatPool.getTomcatWorkers()) - $!{tomcatWorker.getName()}
- #end - 		- - - - #contextDropBoxWOproject($User $context) -
$!{context.getName()} $!{context.getEnv().getName()} Not assigned to a Pool
$!{context.getName()} $!{context.getEnv().getName()} + #foreach ($tomcatWorker in $tomcatPool.getTomcatWorkers()) + $!{tomcatWorker.getName()}
+ #end + 		+ + + + #contextDropBoxWOproject($User $context) +
-#end ## of all contexts - +#end ## of all contexts + #else -
+
- Hosting Pool: - #set ($hps = $view.getHostingPools()) - - + Hosting Pool: + #set ($hps = $view.getHostingPools()) + +
#end -
+
-
+
#parse("/layout/footer.vm") Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/list.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/list.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/list.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/list.vm Wed Jul 5 14:11:29 2006 @@ -36,7 +36,6 @@ #end - #parse("/layout/list2.vm") #if ($plf) Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/menu/global.vm URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/menu/global.vm?rev=419344&r1=419343&r2=419344&view=diff ============================================================================== --- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/menu/global.vm (original) +++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/menu/global.vm Wed Jul 5 14:11:29 2006 @@ -16,50 +16,50 @@ ## $Id$ ##