Index: Apache/Pool/menu/global.vm =================================================================== --- Apache/Pool/menu/global.vm (revision 619464) +++ Apache/Pool/menu/global.vm (working copy) @@ -49,12 +49,12 @@ #if($User.isAllowed("ConfigtestApache")) #end - #if($User.isAllowed("ViewApachePool")) - - #end - #if($User.isAllowed("ViewApachePool")) - - #end + ##if($User.isAllowed("ViewApachePool")) + ## + ##end + ##if($User.isAllowed("ViewApachePool")) + ## + ##end #if($User.isAllowed("DeployApacheConfig")) #end Index: Apache/Pool/menu/indiv.vm =================================================================== --- Apache/Pool/menu/indiv.vm (revision 619464) +++ Apache/Pool/menu/indiv.vm (working copy) @@ -46,12 +46,12 @@ #if($User.isAllowed("ConfigtestApache")) #end - #if($User.isAllowed("ViewApachePool")) - - #end - #if($User.isAllowed("ViewApachePool")) - - #end + ##if($User.isAllowed("ViewApachePool")) + ## + ###end + ##if($User.isAllowed("ViewApachePool")) + ## + ##end #if($User.isAllowed("DeployApacheConfig")) #end Index: Apache/Server/add.vm =================================================================== --- Apache/Server/add.vm (revision 619464) +++ Apache/Server/add.vm (working copy) @@ -131,18 +131,32 @@ - Apache Main: + Apache Template: - #set ($allFiles = $view.getFiles()) + #set ($allFiles = $view.getTemplates()) + + + + Worker.properties Template: + + + + + - - #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") - - - Index: Core/File/details.vm =================================================================== --- Core/File/details.vm (revision 619464) +++ Core/File/details.vm (working copy) @@ -1,97 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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$ -## -#set ($menu = "/layout/menu/EntityTop.vm") -#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 -
-
-
-
-
-#parse("/layout/footer.vm") - - - Index: Core/File/add.vm =================================================================== --- Core/File/add.vm (revision 619464) +++ Core/File/add.vm (working copy) @@ -1,83 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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$ -## -#set ($menu = "/layout/menu/EntityTop.vm") -#set ($pageSelected = "file") -#parse("/layout/header.vm") -
-

- -
- - - - - -
Administration - File - - #parse("Core/File/menu/global.vm") -
-
- -
- -
- - - - - - - - - - - - - - - - - -
- Name(*): - - -
- Content: - - -
- Path(*): - - -
- Descriptor: - - -
- - -
-
-
- #parse("/layout/footer.vm") - - Index: Core/File/list.vm =================================================================== --- Core/File/list.vm (revision 619464) +++ Core/File/list.vm (working copy) @@ -1,99 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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 (!$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 -#end -#set ($entity = "File") -#set ($usesEnv = "false") -#set ($path = "Core/File") -#set ($addFunction = "Add$entity") -#set ($deleteFunction = "Delete$entity") -#if (! $currentPage) -#set ($currentPage = "$appRoot/Core/File/list.vm") -#end - -#parse("/layout/list2.vm") -#if ($plf) -#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 - ##
- ##
- ##
- ##
- ##
-###parse("/layout/footer.vm") -## -## Index: Core/File/confirm.vm =================================================================== --- Core/File/confirm.vm (revision 619464) +++ Core/File/confirm.vm (working copy) @@ -1,34 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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 -
Index: Core/File/add.vm =================================================================== --- Core/File/add.vm (revision 619464) +++ Core/File/add.vm (working copy) @@ -1,83 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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$ -## -#set ($menu = "/layout/menu/EntityTop.vm") -#set ($pageSelected = "file") -#parse("/layout/header.vm") -
-

- -
- - - - - -
Administration - File - - #parse("Core/File/menu/global.vm") -
-
- -
- -
- - - - - - - - - - - - - - - - - -
- Name(*): - - -
- Content: - - -
- Path(*): - - -
- Descriptor: - - -
- - -
-
-
- #parse("/layout/footer.vm") - - Index: Core/File/confirm.vm =================================================================== --- Core/File/confirm.vm (revision 619464) +++ Core/File/confirm.vm (working copy) @@ -1,34 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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 -
Index: Core/File/delete.vm =================================================================== --- Core/File/delete.vm (revision 619464) +++ Core/File/delete.vm (working copy) @@ -1,26 +0,0 @@ -#### -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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$ -## -#set($actionLink = "administration/File/Delete") -#set($methodToCall = "DeleteFile") -#set($buttonName = "Delete") -#set ($function = "DeleteFile") -#set ($currentPage = "delete.vm") -#parse("Core/File/list.vm") \ No newline at end of file Index: Core/File/details.vm =================================================================== --- Core/File/details.vm (revision 619464) +++ Core/File/details.vm (working copy) @@ -1,97 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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$ -## -#set ($menu = "/layout/menu/EntityTop.vm") -#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 -
-
-
-
-
-#parse("/layout/footer.vm") - - - Index: Core/File/list.vm =================================================================== --- Core/File/list.vm (revision 619464) +++ Core/File/list.vm (working copy) @@ -1,99 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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 (!$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 -#end -#set ($entity = "File") -#set ($usesEnv = "false") -#set ($path = "Core/File") -#set ($addFunction = "Add$entity") -#set ($deleteFunction = "Delete$entity") -#if (! $currentPage) -#set ($currentPage = "$appRoot/Core/File/list.vm") -#end - -#parse("/layout/list2.vm") -#if ($plf) -#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 - ##
- ##
- ##
- ##
- ##
-###parse("/layout/footer.vm") -## -## Index: Core/File/menu/global.vm =================================================================== --- Core/File/menu/global.vm (revision 619464) +++ Core/File/menu/global.vm (working copy) @@ -1,38 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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$ -## - - Index: Core/File/menu/indiv.vm =================================================================== --- Core/File/menu/indiv.vm (revision 619464) +++ Core/File/menu/indiv.vm (working copy) @@ -1,35 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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$ -## - - Index: Core/File/menu/global.vm =================================================================== --- Core/File/menu/global.vm (revision 619464) +++ Core/File/menu/global.vm (working copy) @@ -1,38 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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$ -## - - Index: Core/File/menu/indiv.vm =================================================================== --- Core/File/menu/indiv.vm (revision 619464) +++ Core/File/menu/indiv.vm (working copy) @@ -1,35 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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$ -## - - Index: Core/File/update.vm =================================================================== --- Core/File/update.vm (revision 619464) +++ Core/File/update.vm (working copy) @@ -1,90 +0,0 @@ -## -## Licensed to the Apache Software Foundation (ASF) under one -## or more contributor license agreements. See the NOTICE file -## distributed with this work for additional information -## regarding copyright ownership. The ASF licenses this file -## to you 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$ -## -#set ($menu = "/layout/menu/EntityTop.vm") -#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 -
-
-
-
-
-#parse("/layout/footer.vm") - - - Index: Core/Project/details.vm =================================================================== --- Core/Project/details.vm (revision 619464) +++ Core/Project/details.vm (working copy) @@ -49,16 +49,16 @@ All   -#if ($User.isAllowed("AddVirtualHost", $project) || $User.isAllowed("AddVirtualHostToProject", $project) || $User.isAllowed("AddUser", $project) || $User.isAllowed("AddUserToProject", $project) || $User.isAllowed("DeleteProject", $project)) +#if ($User.isAllowed("AddVirtualHost", $projectId) || $User.isAllowed("AddVirtualHostToProject", $projectId) || $User.isAllowed("AddUser", $project) || $User.isAllowed("AddUserToProject", $project) || $User.isAllowed("DeleteProject", $project)) @@ -90,14 +90,14 @@   $!{ap.getName()} - #if ($User.isAllowed("AddContext", $project) || $User.isAllowed("AddUser", $project) || $User.isAllowed("AddUserToProject", $project) || $User.isAllowed("DeleteVirtualHost", $project, $vhost) || $User.isAllowed("ViewVirtualHost", $project, $vhost) || $User.isAllowed("UpdateVirtualHost", $project, $vhost)) + #if ($User.isAllowed("AddContext", $projectId) || $User.isAllowed("AddUser", $projectId) || $User.isAllowed("AddUserToProject", $projectId) || $User.isAllowed("DeleteVirtualHost", $project, $vhost) || $User.isAllowed("ViewVirtualHost", $project, $vhost) || $User.isAllowed("UpdateVirtualHost", $project, $vhost)) @@ -63,14 +63,27 @@ Name:
Path:
Descriptor:
- Content:
- + Content: + Click here to see valid variables + +
+ #end #else - File: - #set ($files = $view.getFiles()) + Template: + #set ($files = $view.getTemplates())
-###parse("/layout/footer.vm") -## -## Index: Core/Template/menu/global.vm =================================================================== --- Core/Template/menu/global.vm (revision 619464) +++ Core/Template/menu/global.vm (working copy) @@ -21,18 +21,21 @@ Index: Core/Template/menu/indiv.vm =================================================================== --- Core/Template/menu/indiv.vm (revision 619464) +++ Core/Template/menu/indiv.vm (working copy) @@ -21,15 +21,18 @@ Index: Core/Template/update.vm =================================================================== --- Core/Template/update.vm (revision 619464) +++ Core/Template/update.vm (working copy) @@ -19,7 +19,7 @@ ## $Id$ ## #set ($menu = "/layout/menu/EntityTop.vm") -#set ($pageSelected = "file") +#set ($pageSelected = "template") #parse("/layout/header.vm")


@@ -27,10 +27,10 @@
-
Administration - File + Administration - Template - #parse("Core/File/menu/global.vm") + #parse("Core/Template/menu/global.vm")
@@ -43,7 +43,7 @@ { var myindex = dropdown.selectedIndex; var SelValue = dropdown.options[myindex].value; - var baseURL = "$appRoot/Core/File/update.vm?id=" + SelValue; + var baseURL = "$appRoot/Core/Template/update.vm?id=" + SelValue; top.location.href = baseURL; return true; @@ -54,7 +54,7 @@ #set ($methodToCall = "UpdateFile") #if($id) - #set ($file = $view.getFile($id)) + #set ($file = $view.getTemplate($id)) #if ($User.isAllowed("UpdateFile") && $methodToCall == "UpdateFile")
@@ -63,14 +63,27 @@ Name:
Path:
Descriptor:
- Content:
- + Content: + Click here to see valid variables + +
+
#end #else - File: - #set ($files = $view.getFiles()) + Template: + #set ($files = $view.getTemplates()) #end #set($c = 1) - + ## #if( $collection && ! $collection.isEmpty()) Index: layout/style.vmcss =================================================================== --- layout/style.vmcss (revision 619464) +++ layout/style.vmcss (working copy) @@ -600,4 +600,29 @@ .popup { POSITION: absolute; VISIBILITY: hidden; BACKGROUND-COLOR: silver; LAYER-BACKGROUND-COLOR: yellow; width: 250; BORDER-LEFT: 1px solid black; BORDER-TOP: 1px solid black; BORDER-BOTTOM: 3px solid black; BORDER-RIGHT: 3px solid black; PADDING: 3px; z-index: 10 } +/* template css */ +#viewTemplateVars { + text-decoration: underline; + color: #0000FF; +} +#templateVariables { + display: none; + position: absolute; + padding: 10px 10px 10px 10px; + background-color: FFFFCC; + border: 1px solid #000000; +} + +#templateVariables .templateVar { + display: block; +} +#templateVariables .templateNotice { + display: block; + color: #FF0000; + font-weight:bold; +} + + + + Index: Tomcat/Pool/menu/global.vm =================================================================== --- Tomcat/Pool/menu/global.vm (revision 619464) +++ Tomcat/Pool/menu/global.vm (working copy) @@ -43,9 +43,9 @@ #if($User.isAllowed("StartTomcat")) #end - #if($User.isAllowed("ViewTomcatPool")) - - #end + ##if($User.isAllowed("ViewTomcatPool")) + ## + ##end #if($User.isAllowed("DeployTomcatConfig")) #end Index: Tomcat/Pool/menu/indiv.vm =================================================================== --- Tomcat/Pool/menu/indiv.vm (revision 619464) +++ Tomcat/Pool/menu/indiv.vm (working copy) @@ -40,9 +40,9 @@ #if($User.isAllowed("StartTomcat")) #end - #if($User.isAllowed("ViewTomcatPool")) - - #end + ##if($User.isAllowed("ViewTomcatPool")) + ## + ###end #if($User.isAllowed("DeployTomcatConfig")) #end Index: Tomcat/Server/add.vm =================================================================== --- Tomcat/Server/add.vm (revision 619464) +++ Tomcat/Server/add.vm (working copy) @@ -143,25 +143,38 @@ -
Index: Tomcat/Server/details.vm =================================================================== --- Tomcat/Server/details.vm (revision 619464) +++ Tomcat/Server/details.vm (working copy) @@ -67,6 +67,26 @@ JVM Options: + Tomcat Templates: + #set ($templates = $!{tomcat.getTemplates()}) + #set($cc=2) + #set ($next = false) + #if (!$templates || $templates.isEmpty()) + + #end + #foreach ($template in $templates) + #if ($next == true) + + #end + #if ($cc == 1) + #set($cc=2) + #else + #set($cc=1) + #end + $!{template.getName()} + + #set ($next = true) + #end #set ($collection = $view.getTomcatWorkers($tomcat)) Index: Tomcat/Server/update.vm =================================================================== --- Tomcat/Server/update.vm (revision 619464) +++ Tomcat/Server/update.vm (working copy) @@ -66,6 +66,29 @@ Java Home:
Environment Varibles:
Java Options:
+Current Templates:
+#set ($templates = $!{tomcat.getTemplates()}) +#foreach ($template in $templates) + $!{template.getName()}
+#end +
+New Server.xml Template: + #set ($allFiles = $view.getTemplates()) + +
+New JVM.conf Template: + +
+
+Be sure you have the correct template selected before clicking 'Update'!

@@ -79,7 +102,6 @@

Index: Tomcat/Worker/menu/global.vm =================================================================== --- Tomcat/Worker/menu/global.vm (revision 619464) +++ Tomcat/Worker/menu/global.vm (working copy) @@ -26,7 +26,7 @@ - + ## Index: Tomcat/Worker/menu/indiv.vm =================================================================== --- Tomcat/Worker/menu/indiv.vm (revision 619464) +++ Tomcat/Worker/menu/indiv.vm (working copy) @@ -39,10 +39,12 @@ #end #if($User.isAllowed("StartTomcat")) + #end + #foreach ($template in $ent.getTomcat().getTemplates()) + #if($User.isAllowed("ViewTomcatWorker")) + + #end #end - #if($User.isAllowed("ViewTomcatWorker")) - - #end #if($User.isAllowed("DeployTomcatConfig")) #end Index: Tomcat/Worker/viewconf.vm =================================================================== --- Tomcat/Worker/viewconf.vm (revision 619464) +++ Tomcat/Worker/viewconf.vm (working copy) @@ -27,6 +27,11 @@ #set ($id = $request.getParameter("id")) #end +#if ($request.getParameter("ct")) +#set ($ct = $request.getParameter("ct")) +#end + +


@@ -46,7 +51,7 @@ #if ($id) #set ($tomcatWorker = $view.getTomcatWorker($id)) - + #else Tomcat Worker: #set ($tws = $view.getTomcatWorkers())