incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r422760 - in /incubator/lokahi/lokahi/trunk/src: java/org/apache/lokahi/core/agent/callable/context/ java/org/apache/lokahi/core/agent/task/ www/Core/Alerts/ www/Core/Environment/ www/Core/File/ www/Core/Instance/ www/Core/Server/menu/ www/...
Date Mon, 17 Jul 2006 16:39:27 GMT
Author: toback
Date: Mon Jul 17 09:39:25 2006
New Revision: 422760

URL: http://svn.apache.org/viewvc?rev=422760&view=rev
Log:
Updated per board resolution, as described here:

http://mail-archives.apache.org/mod_mbox/www-legal-discuss/200606.mbox/%3c1551070F-EDE7-40DC-9C97-79BF24E9FD59@apache.org%3e

Modified:
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/context/InstallContextCallable.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/context/UndeployContextCallable.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/InstallContextTask.java
    incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/UndeployContextTask.java
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Environment/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/details.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/list.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm
    incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm
    incubator/lokahi/lokahi/trunk/src/www/wap/confirm.wml
    incubator/lokahi/lokahi/trunk/src/www/wap/details.wml
    incubator/lokahi/lokahi/trunk/src/www/wap/home.wml
    incubator/lokahi/lokahi/trunk/src/www/wap/index.wml
    incubator/lokahi/lokahi/trunk/src/www/wap/redirect.wml
    incubator/lokahi/lokahi/trunk/src/www/wap/results.wml

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/context/InstallContextCallable.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/context/InstallContextCallable.java?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/context/InstallContextCallable.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/context/InstallContextCallable.java Mon Jul 17 09:39:25 2006
@@ -1,44 +1,47 @@
-/*
-* 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.
-*/
-package org.apache.lokahi.core.agent.callable.context;
-
-import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
-
-import java.util.concurrent.Callable;
-
-/**
- * @author Stephen Toback
- * @version $Id$
- */
-public class InstallContextCallable implements Callable<Boolean> {
-  private AgentTomcat tc;
-  private String contextName;
-  private String docBase;
-
-  public InstallContextCallable(AgentTomcat tc, String contextName, String docBase) {
-    this.tc = tc;
-    this.contextName = contextName;
-    this.docBase = docBase;
-  }
-
-  public Boolean call() throws Exception {
-    return tc.addContext(contextName, docBase);
-  }
-
-}
-
-
-
+/*
+* 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.
+*/
+package org.apache.lokahi.core.agent.callable.context;
+
+import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
+
+import java.util.concurrent.Callable;
+
+/**
+ * @author Stephen Toback
+ * @version $Id$
+ */
+public class InstallContextCallable implements Callable<Boolean> {
+  private AgentTomcat tc;
+  private String contextName;
+  private String docBase;
+
+  public InstallContextCallable(AgentTomcat tc, String contextName, String docBase) {
+    this.tc = tc;
+    this.contextName = contextName;
+    this.docBase = docBase;
+  }
+
+  public Boolean call() throws Exception {
+    return tc.addContext(contextName, docBase);
+  }
+
+}
+
+
+

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/context/UndeployContextCallable.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/context/UndeployContextCallable.java?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/context/UndeployContextCallable.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/callable/context/UndeployContextCallable.java Mon Jul 17 09:39:25 2006
@@ -1,44 +1,47 @@
-/*
-* 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.
-*/
-package org.apache.lokahi.core.agent.callable.context;
-
-import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
-
-import java.util.concurrent.Callable;
-
-/**
- * @author Stephen Toback
- * @version $Id$
- */
-public class UndeployContextCallable implements Callable<Boolean> {
-  private AgentTomcat tc;
-  private String contextName;
-  private String docBase;
-
-  public UndeployContextCallable(AgentTomcat tc, String contextName, String docBase) {
-    this.tc = tc;
-    this.contextName = contextName;
-    this.docBase = docBase;
-  }
-
-  public Boolean call() throws Exception {
-    return tc.removeContext(contextName);
-  }
-
-}
-
-
-
+/*
+* 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.
+*/
+package org.apache.lokahi.core.agent.callable.context;
+
+import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
+
+import java.util.concurrent.Callable;
+
+/**
+ * @author Stephen Toback
+ * @version $Id$
+ */
+public class UndeployContextCallable implements Callable<Boolean> {
+  private AgentTomcat tc;
+  private String contextName;
+  private String docBase;
+
+  public UndeployContextCallable(AgentTomcat tc, String contextName, String docBase) {
+    this.tc = tc;
+    this.contextName = contextName;
+    this.docBase = docBase;
+  }
+
+  public Boolean call() throws Exception {
+    return tc.removeContext(contextName);
+  }
+
+}
+
+
+

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/InstallContextTask.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/InstallContextTask.java?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/InstallContextTask.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/InstallContextTask.java Mon Jul 17 09:39:25 2006
@@ -1,61 +1,64 @@
-/*
-* 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.
-*/
-package org.apache.lokahi.core.agent.task;
-
-import org.apache.lokahi.core.agent.AbstractAgentTask;
-import org.apache.lokahi.core.agent.callable.context.InstallContextCallable;
-import org.apache.lokahi.core.agent.dao.AgentJob;
-import org.apache.lokahi.core.agent.dao.TaskType;
-import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
-import org.apache.lokahi.core.agent.util.ProcessFactory;
-import org.apache.lokahi.core.agent.util.TMCTaskException;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
-
-/**
- * @author Stephen Toback
- * @version $Id$
- */
-public class InstallContextTask extends AbstractAgentTask<Boolean> {
-
-  /** @deprecated  */
-  public InstallContextTask(int jobId, TaskType t, AgentTomcat tc, String contextName, String docBase) {
-    this.task = new FutureTask<Boolean>(new InstallContextCallable(tc, contextName, docBase));
-    this.setJobId(jobId);
-    this.setType(t);
-  }
-
-  public InstallContextTask(AgentJob j) {
-    AgentTomcat tc = ProcessFactory.getTomcatByHttpPort(j.getOptions()[0]);
-    this.task = new FutureTask<Boolean>(new InstallContextCallable(tc, j.getOptions()[1], j.getOptions()[2]));
-    this.setJobId(j.getPk());
-    this.setType(j.getType());
-  }
-
-  public InstallContextTask() {
-  }
-
-  public String getResult() throws TMCTaskException, ExecutionException, InterruptedException {
-    if (!task.get()) throw new TMCTaskException("Error in context install");
-    return "Context installation was sucessful";
-  }
-
-}
-
-
-
-
+/*
+* 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.
+*/
+package org.apache.lokahi.core.agent.task;
+
+import org.apache.lokahi.core.agent.AbstractAgentTask;
+import org.apache.lokahi.core.agent.callable.context.InstallContextCallable;
+import org.apache.lokahi.core.agent.dao.AgentJob;
+import org.apache.lokahi.core.agent.dao.TaskType;
+import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
+import org.apache.lokahi.core.agent.util.ProcessFactory;
+import org.apache.lokahi.core.agent.util.TMCTaskException;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+
+/**
+ * @author Stephen Toback
+ * @version $Id$
+ */
+public class InstallContextTask extends AbstractAgentTask<Boolean> {
+
+  /** @deprecated  */
+  public InstallContextTask(int jobId, TaskType t, AgentTomcat tc, String contextName, String docBase) {
+    this.task = new FutureTask<Boolean>(new InstallContextCallable(tc, contextName, docBase));
+    this.setJobId(jobId);
+    this.setType(t);
+  }
+
+  public InstallContextTask(AgentJob j) {
+    AgentTomcat tc = ProcessFactory.getTomcatByHttpPort(j.getOptions()[0]);
+    this.task = new FutureTask<Boolean>(new InstallContextCallable(tc, j.getOptions()[1], j.getOptions()[2]));
+    this.setJobId(j.getPk());
+    this.setType(j.getType());
+  }
+
+  public InstallContextTask() {
+  }
+
+  public String getResult() throws TMCTaskException, ExecutionException, InterruptedException {
+    if (!task.get()) throw new TMCTaskException("Error in context install");
+    return "Context installation was sucessful";
+  }
+
+}
+
+
+
+

Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/UndeployContextTask.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/UndeployContextTask.java?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/UndeployContextTask.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/UndeployContextTask.java Mon Jul 17 09:39:25 2006
@@ -1,61 +1,64 @@
-/*
-* 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.
-*/
-package org.apache.lokahi.core.agent.task;
-
-import org.apache.lokahi.core.agent.AbstractAgentTask;
-import org.apache.lokahi.core.agent.callable.context.UndeployContextCallable;
-import org.apache.lokahi.core.agent.dao.AgentJob;
-import org.apache.lokahi.core.agent.dao.TaskType;
-import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
-import org.apache.lokahi.core.agent.util.ProcessFactory;
-import org.apache.lokahi.core.agent.util.TMCTaskException;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
-
-/**
- * @author Stephen Toback
- * @version $Id$
- */
-public class UndeployContextTask extends AbstractAgentTask<Boolean> {
-
-  /** @deprecated  */
-  public UndeployContextTask(int jobId, TaskType t, AgentTomcat tc, String contextName, String docBase) {
-    this.task = new FutureTask<Boolean>(new UndeployContextCallable(tc, contextName, docBase));
-    this.setJobId(jobId);
-    this.setType(t);
-  }
-
-  public UndeployContextTask(AgentJob j) {
-    AgentTomcat tc = ProcessFactory.getTomcatByHttpPort(j.getOptions()[0]);
-    this.task = new FutureTask<Boolean>(new UndeployContextCallable(tc, j.getOptions()[1], j.getOptions()[2]));
-    this.setJobId(j.getPk());
-    this.setType(j.getType());
-  }
-
-  public UndeployContextTask() {
-  }
-
-  public String getResult() throws TMCTaskException, ExecutionException, InterruptedException {
-    if (!task.get()) throw new TMCTaskException("Error in context undeploy");
-    return "Context undeploy was sucessful";
-  }
-
-}
-
-
-
-
+/*
+* 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.
+*/
+package org.apache.lokahi.core.agent.task;
+
+import org.apache.lokahi.core.agent.AbstractAgentTask;
+import org.apache.lokahi.core.agent.callable.context.UndeployContextCallable;
+import org.apache.lokahi.core.agent.dao.AgentJob;
+import org.apache.lokahi.core.agent.dao.TaskType;
+import org.apache.lokahi.core.agent.interfaces.AgentTomcat;
+import org.apache.lokahi.core.agent.util.ProcessFactory;
+import org.apache.lokahi.core.agent.util.TMCTaskException;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+
+/**
+ * @author Stephen Toback
+ * @version $Id$
+ */
+public class UndeployContextTask extends AbstractAgentTask<Boolean> {
+
+  /** @deprecated  */
+  public UndeployContextTask(int jobId, TaskType t, AgentTomcat tc, String contextName, String docBase) {
+    this.task = new FutureTask<Boolean>(new UndeployContextCallable(tc, contextName, docBase));
+    this.setJobId(jobId);
+    this.setType(t);
+  }
+
+  public UndeployContextTask(AgentJob j) {
+    AgentTomcat tc = ProcessFactory.getTomcatByHttpPort(j.getOptions()[0]);
+    this.task = new FutureTask<Boolean>(new UndeployContextCallable(tc, j.getOptions()[1], j.getOptions()[2]));
+    this.setJobId(j.getPk());
+    this.setType(j.getType());
+  }
+
+  public UndeployContextTask() {
+  }
+
+  public String getResult() throws TMCTaskException, ExecutionException, InterruptedException {
+    if (!task.get()) throw new TMCTaskException("Error in context undeploy");
+    return "Context undeploy was sucessful";
+  }
+
+}
+
+
+
+

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/confirm.vm Mon Jul 17 09:39:25 2006
@@ -1,31 +1,34 @@
-##
-## 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$
-##
-<div class="messagebox">
-  #if ($User.isAllowed($function) && $methodToCall && $actionLink)
-  <br />
-
-  <form name="Form" method="post" action='$link.setAction($actionLink)'>
-    <input type=hidden name="methodToCall" value="$methodToCall">
-    <input type="submit" value="$buttonName"><br />
-    <br />
-    $methodToCall
-    <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
-    $individual.getName()
-  </form>
-  #end
+##
+## 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$
+##
+<div class="messagebox">
+  #if ($User.isAllowed($function) && $methodToCall && $actionLink)
+  <br />
+
+  <form name="Form" method="post" action='$link.setAction($actionLink)'>
+    <input type=hidden name="methodToCall" value="$methodToCall">
+    <input type="submit" value="$buttonName"><br />
+    <br />
+    $methodToCall
+    <input type=hidden name=id value="$individual.getPk()">&nbsp;&nbsp;
+    $individual.getName()
+  </form>
+  #end
 </div>

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/details.vm Mon Jul 17 09:39:25 2006
@@ -1,96 +1,99 @@
-##
-## 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$
-##
-#set ($menu = "/layout/menu/EntityTop.vm")
-#set ($pageSelected = "alert")
-#parse("/layout/header.vm")
-<div align="center" class="contentbox">
-  <br /><br />
-
-  <div class="projectbox">
-    <table width="100%" border="0" cellspacing="0" cellpadding="1">
-      <tr class="info" valign="top">
-        <td colspan=3>Administration - <b>Alert</b>
-        </td>
-        <td align="right">
-          #parse("Core/Alerts/menu/global.vm")
-        </td>
-      </tr>
-    </table>
-    <br />
-
-    <div class="messagebox">
-      <SCRIPT LANGUAGE=javascript>
-        <!--
-        function OnChangeIn(dropdown)
-        {
-          var myindex = dropdown.selectedIndex;
-          var SelValue = dropdown.options[myindex].value;
-          var baseURL = "$appRoot/Core/Alerts/details.vm?id=" + SelValue;
-          top.location.href = baseURL;
-
-          return true;
-        }
-        //-->
-      </SCRIPT>
-      #set ($id = $request.getParameter("id"))
-      #set ($idNum = 1)
-
-      #if($id)
-      #set ($methodToCall = "UpdateAlert")
-      #set ($a = $alertSet.getAlertById($idNum.valueOf($id)))
-
-      #if ($User.isAllowed("ViewAlert"))
-      <br />
-      Alert Title: $!{a.getName()}<br />
-      Alert Link: $!{a.getLink()}<br />
-      Alert Content: $!{a.getContent()}<br />
-      #end
-
-      #if ($User.isAllowed("UpdateAlert") && $methodToCall == "UpdateAlert")
-      <br />
-      <a href="$appRoot/Core/Alerts/update.vm?id=$id">Update this Alert</a> &nbsp;<br /><br />
-      <br />
-      #end
-
-      #if ($User.isAllowed("DeleteAlert"))
-      <form method="post" action='$link.setAction("administration/AlertAction")' method="post">
-        <input type="hidden" name="id" value="$!{id}">
-        <input type="hidden" name="methodToCall" value="DeleteAlert">
-        #submit_button("Submit" "Delete" "button" "")
-      </form>
-      #end
-      #else
-      <br />
-      Alert:
-      #set ($als = $alertSet.getRecentAlerts())
-      <select name=id onchange='OnChangeIn(this);'>
-        <option value="">Select one
-          #foreach ($al in $als)
-        <option value="$al.getPk()">$al.getName()</option>
-        #end
-      </select><br />
-      <br />
-      #end
-
-    </div>
-    <br />
-  </div>
-  <br />
-</div>
-#parse("/layout/footer.vm")
-
+##
+## 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 = "alert")
+#parse("/layout/header.vm")
+<div align="center" class="contentbox">
+  <br /><br />
+
+  <div class="projectbox">
+    <table width="100%" border="0" cellspacing="0" cellpadding="1">
+      <tr class="info" valign="top">
+        <td colspan=3>Administration - <b>Alert</b>
+        </td>
+        <td align="right">
+          #parse("Core/Alerts/menu/global.vm")
+        </td>
+      </tr>
+    </table>
+    <br />
+
+    <div class="messagebox">
+      <SCRIPT LANGUAGE=javascript>
+        <!--
+        function OnChangeIn(dropdown)
+        {
+          var myindex = dropdown.selectedIndex;
+          var SelValue = dropdown.options[myindex].value;
+          var baseURL = "$appRoot/Core/Alerts/details.vm?id=" + SelValue;
+          top.location.href = baseURL;
+
+          return true;
+        }
+        //-->
+      </SCRIPT>
+      #set ($id = $request.getParameter("id"))
+      #set ($idNum = 1)
+
+      #if($id)
+      #set ($methodToCall = "UpdateAlert")
+      #set ($a = $alertSet.getAlertById($idNum.valueOf($id)))
+
+      #if ($User.isAllowed("ViewAlert"))
+      <br />
+      Alert Title: $!{a.getName()}<br />
+      Alert Link: $!{a.getLink()}<br />
+      Alert Content: $!{a.getContent()}<br />
+      #end
+
+      #if ($User.isAllowed("UpdateAlert") && $methodToCall == "UpdateAlert")
+      <br />
+      <a href="$appRoot/Core/Alerts/update.vm?id=$id">Update this Alert</a> &nbsp;<br /><br />
+      <br />
+      #end
+
+      #if ($User.isAllowed("DeleteAlert"))
+      <form method="post" action='$link.setAction("administration/AlertAction")' method="post">
+        <input type="hidden" name="id" value="$!{id}">
+        <input type="hidden" name="methodToCall" value="DeleteAlert">
+        #submit_button("Submit" "Delete" "button" "")
+      </form>
+      #end
+      #else
+      <br />
+      Alert:
+      #set ($als = $alertSet.getRecentAlerts())
+      <select name=id onchange='OnChangeIn(this);'>
+        <option value="">Select one
+          #foreach ($al in $als)
+        <option value="$al.getPk()">$al.getName()</option>
+        #end
+      </select><br />
+      <br />
+      #end
+
+    </div>
+    <br />
+  </div>
+  <br />
+</div>
+#parse("/layout/footer.vm")
+

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/list.vm Mon Jul 17 09:39:25 2006
@@ -1,44 +1,47 @@
-##
-## 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 (!$collection)
-#set ($menu = "/layout/menu/EntityTop.vm")
-#set ($pageSelected = "alerts")
-#parse("/layout/header.vm")
-
-#set ($plf = "true")
-#if ($request.getParameter("id"))
-#set ($id = $request.getParameter("id"))
-#set ($idNum = 1)
-#set ($individual = $alertSet.getAlertById($idNum.valueOf($id)))
-#set ($indivPage = "/Core/Alerts/confirm.vm")
-#else
-#set ($collection = $alertSet.getRecentAlerts())
-#end
-#end
-#set ($entity = "Alerts")
-#set ($category = "Administration")
-#set ($usesEnv = "false")
-#set ($path = "Core/Alerts")
-#if (!$currentPage)
-#set ($currentPage = "$appRoot/Core/Alerts/list.vm")
-#end
-
-#parse("/layout/list2.vm")
-#if ($plf)
-#parse("/layout/footer.vm")
-#end
+##
+## 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 = "alerts")
+#parse("/layout/header.vm")
+
+#set ($plf = "true")
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#set ($idNum = 1)
+#set ($individual = $alertSet.getAlertById($idNum.valueOf($id)))
+#set ($indivPage = "/Core/Alerts/confirm.vm")
+#else
+#set ($collection = $alertSet.getRecentAlerts())
+#end
+#end
+#set ($entity = "Alerts")
+#set ($category = "Administration")
+#set ($usesEnv = "false")
+#set ($path = "Core/Alerts")
+#if (!$currentPage)
+#set ($currentPage = "$appRoot/Core/Alerts/list.vm")
+#end
+
+#parse("/layout/list2.vm")
+#if ($plf)
+#parse("/layout/footer.vm")
+#end

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Environment/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Environment/confirm.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Environment/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Environment/confirm.vm Mon Jul 17 09:39:25 2006
@@ -1,31 +1,34 @@
-##
-## 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$
-##
-<div class="messagebox">
-  #if ($User.isAllowed($function) && $methodToCall && $actionLink)
-  <br />
-
-  <form name="Form" method="post" action='$link.setAction($actionLink)'>
-    <input type=hidden name="methodToCall" value="$methodToCall">
-    <input type="submit" value="$buttonName"><br />
-    <br />
-    $methodToCall
-    <input type=hidden id=envId name=envId value="$individual.getPk()">&nbsp;&nbsp;
-    $individual.getName()
-  </form>
-  #end
+##
+## 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$
+##
+<div class="messagebox">
+  #if ($User.isAllowed($function) && $methodToCall && $actionLink)
+  <br />
+
+  <form name="Form" method="post" action='$link.setAction($actionLink)'>
+    <input type=hidden name="methodToCall" value="$methodToCall">
+    <input type="submit" value="$buttonName"><br />
+    <br />
+    $methodToCall
+    <input type=hidden id=envId name=envId value="$individual.getPk()">&nbsp;&nbsp;
+    $individual.getName()
+  </form>
+  #end
 </div>

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/File/confirm.vm Mon Jul 17 09:39:25 2006
@@ -1,31 +1,34 @@
-##
-## 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$
-##
-<div class="messagebox">
-<!-- $function $User.isAllowed($function)  $methodToCall  $actionLink -->
-#if ($User.isAllowed($function) && $methodToCall && $actionLink)
-<br />
-<form name="Form" method="post" action='$link.setAction($actionLink)'>
-<input type=hidden name="methodToCall" value="$methodToCall" >
-<input type="submit" value="$buttonName"><br />
-<br />
-$methodToCall
-<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
-$individual.getName()
-</form>
-#end
-</div>
+##
+## 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$
+##
+<div class="messagebox">
+<!-- $function $User.isAllowed($function)  $methodToCall  $actionLink -->
+#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<br />
+<form name="Form" method="post" action='$link.setAction($actionLink)'>
+<input type=hidden name="methodToCall" value="$methodToCall" >
+<input type="submit" value="$buttonName"><br />
+<br />
+$methodToCall
+<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
+$individual.getName()
+</form>
+#end
+</div>

Modified: 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=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Instance/confirm.vm Mon Jul 17 09:39:25 2006
@@ -1,31 +1,34 @@
-##
-## 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$
-##
-<div class="messagebox">
-<!-- $function $User.isAllowed($function)  $methodToCall  $actionLink -->
-#if ($User.isAllowed($function) && $methodToCall && $actionLink)
-<br />
-<form name="Form" method="post" action='$link.setAction($actionLink)'>
-<input type=hidden name="methodToCall" value="$methodToCall" >
-<input type="submit" value="$buttonName"><br />
-<br />
-$methodToCall
-<input type=hidden name=instanceId value="$individual.getPk()" >&nbsp;&nbsp;
-$individual.getName()
-</form>
-#end
-</div>
+##
+## 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$
+##
+<div class="messagebox">
+<!-- $function $User.isAllowed($function)  $methodToCall  $actionLink -->
+#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<br />
+<form name="Form" method="post" action='$link.setAction($actionLink)'>
+<input type=hidden name="methodToCall" value="$methodToCall" >
+<input type="submit" value="$buttonName"><br />
+<br />
+$methodToCall
+<input type=hidden name=instanceId value="$individual.getPk()" >&nbsp;&nbsp;
+$individual.getName()
+</form>
+#end
+</div>

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/search.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/menu/search.vm Mon Jul 17 09:39:25 2006
@@ -1,23 +1,26 @@
-##
-## 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$
-##
-<option value="$appRoot/Core/Server/list.vm">&nbsp;View Hardware&nbsp;</option>
-<option value="$appRoot/Apache/Server/list.vm">&nbsp;View Apache&nbsp;</option>
-<option value="$appRoot/Tomcat/Server/list.vm">&nbsp;View Tomcat&nbsp;</option>
-<option value="$appRoot/Core/Server/add.vm">&nbsp;Add Hardware&nbsp;</option>
-<option value="$appRoot/Apache/Server/add.vm">&nbsp;Add Apache&nbsp;</option>
-<option value="$appRoot/Tomcat/Server/add.vm">&nbsp;Add Tomcat&nbsp;</option>
+##
+## 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$
+##
+<option value="$appRoot/Core/Server/list.vm">&nbsp;View Hardware&nbsp;</option>
+<option value="$appRoot/Apache/Server/list.vm">&nbsp;View Apache&nbsp;</option>
+<option value="$appRoot/Tomcat/Server/list.vm">&nbsp;View Tomcat&nbsp;</option>
+<option value="$appRoot/Core/Server/add.vm">&nbsp;Add Hardware&nbsp;</option>
+<option value="$appRoot/Apache/Server/add.vm">&nbsp;Add Apache&nbsp;</option>
+<option value="$appRoot/Tomcat/Server/add.vm">&nbsp;Add Tomcat&nbsp;</option>

Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Worker/menu/search.vm Mon Jul 17 09:39:25 2006
@@ -1,21 +1,24 @@
-##
-## 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$
-##
-<option value="$appRoot/Apache/Worker/list.vm">&nbsp;View Apache&nbsp;</option>
-<option value="$appRoot/Tomcat/Worker/list.vm">&nbsp;View Tomcat&nbsp;</option>
-<option value="$appRoot/Apache/Worker/add.vm">&nbsp;Add Apache&nbsp;</option>
-<option value="$appRoot/Tomcat/Worker/add.vm">&nbsp;Add Tomcat&nbsp;</option>
+##
+## 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$
+##
+<option value="$appRoot/Apache/Worker/list.vm">&nbsp;View Apache&nbsp;</option>
+<option value="$appRoot/Tomcat/Worker/list.vm">&nbsp;View Tomcat&nbsp;</option>
+<option value="$appRoot/Apache/Worker/add.vm">&nbsp;Add Apache&nbsp;</option>
+<option value="$appRoot/Tomcat/Worker/add.vm">&nbsp;Add Tomcat&nbsp;</option>

Modified: incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/confirm.vm Mon Jul 17 09:39:25 2006
@@ -1,31 +1,34 @@
-##
-## 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$
-##
-<div class="messagebox">
-<!-- $function $User.isAllowed($function)  $methodToCall  $actionLink -->
-#if ($User.isAllowed($function) && $methodToCall && $actionLink)
-<br />
-<form name="Form" method="post" action='$link.setAction($actionLink)'>
-<input type=hidden name="methodToCall" value="$methodToCall" >
-<input type="submit" value="$buttonName"><br />
-<br />
-$methodToCall
-<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
-$individual.getName()
-</form>
-#end
-</div>
+##
+## 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$
+##
+<div class="messagebox">
+<!-- $function $User.isAllowed($function)  $methodToCall  $actionLink -->
+#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<br />
+<form name="Form" method="post" action='$link.setAction($actionLink)'>
+<input type=hidden name="methodToCall" value="$methodToCall" >
+<input type="submit" value="$buttonName"><br />
+<br />
+$methodToCall
+<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
+$individual.getName()
+</form>
+#end
+</div>

Modified: incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/delete.vm Mon Jul 17 09:39:25 2006
@@ -1,23 +1,26 @@
-##
-## 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$
-##
-#set($actionLink = "help/HelpItemAction")
-#set($methodToCall = "DeleteHelpItem")
-#set($buttonName = "Delete")
-#set ($function = "DeleteHelpItem")
-#set ($currentPage = "delete.vm")
-#parse("Help/list.vm")
+##
+## 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 = "help/HelpItemAction")
+#set($methodToCall = "DeleteHelpItem")
+#set($buttonName = "Delete")
+#set ($function = "DeleteHelpItem")
+#set ($currentPage = "delete.vm")
+#parse("Help/list.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/Help/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/details.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/details.vm Mon Jul 17 09:39:25 2006
@@ -1,171 +1,174 @@
-##
-## 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$
-##
-#set ($menu = "/layout/menu/HelpTop.vm")
-#set ($pageSelected = "help")
-#parse("/layout/header.vm")
-<div align="center" class="contentbox">
-<br /><br />
-
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-  <tr class="info" valign="top">
-    <td colspan=3>Help Items - <b>Help</b>
-    </td>
-    <td align="right">
-      #parse("Help/menu/global.vm")
-    </td>
-  </tr>
-</table>
-<br />
-
-<div class="messagebox">
-<SCRIPT LANGUAGE=javascript>
-  <!--
-  function OnChangeIn(dropdown)
-  {
-    var myindex = dropdown.selectedIndex;
-    var SelValue = dropdown.options[myindex].value;
-    var baseURL = "$appRoot/Help/details.vm?id=" + SelValue;
-    top.location.href = baseURL;
-
-    return true;
-  }
-  //-->
-</SCRIPT>
-#set ($id = $request.getParameter("id"))
-#set ($idNum = 1)
-
-#if($id)
-#set ($methodToCall = "UpdateHelpItem")
-#set ($helpItem = $helpHelper.getHelpItem($id))
-
-<br />
-<table>
-  <tr>
-    <td>
-      <b>Title:</b>
-    </td>
-    <td>
-      $!{helpItem.getTitle()}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>Topic:</b>
-    </td>
-    <td>
-      $!{helpItem.getTopic()}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>Subtopic:</b>
-    </td>
-    <td>
-      $!{helpItem.getSubtopic()}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>Summary:</b>
-    </td>
-    <td>
-      $!{helpItem.getSummary()}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>Keywords:</b>
-    </td>
-    <td>
-      $!{helpItem.getKeywordsForWeb()}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>Content:</b>
-    </td>
-    <td>
-      $!{helpItem.getContent()}
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>Function:<b/>
-    </td>
-    <td>
-      #foreach( $f in $User.getAllMyFunctions())
-      #if ($f.getPk() == $helpItem.getFunctionId())
-      #set ($name = $f.getName())
-      #end
-      #end
-      #if ($name)
-      $name <br />
-      #else
-      No Function Limitation<br />
-      #end
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b>Valid:</b>
-    </td>
-    <td>
-      #if ($helpItem.isValid())
-      True
-      #else
-      False
-      #end
-      <br\>
-    </td>
-  </tr>
-</table>
-
-#if ($User.isAllowed("UpdateHelpItem") && $methodToCall == "UpdateHelpItem")
-<br\>
-<a href="$appRoot/Help/update.vm?id=$id">Update this Help Item</a> &nbsp;<br /><br />
-<br />
-#end
-
-#if ($User.isAllowed("DeleteHelpItem"))
-<form method="post" action='$link.setAction("help/HelpItemAction")' method="post">
-  <input type="hidden" name="id" value="$!{id}">
-  <input type="hidden" name="methodToCall" value="DeleteHelpItem">
-  #submit_button("Submit" "Delete" "button" "")
-</form>
-#end
-#else
-<br />
-Help Item:
-#set ($hs = $helpHelper.getHelpItems())
-<select name=id onchange='OnChangeIn(this);'>
-  <option value="">Select one
-    #foreach ($h in $hs)
-  <option value="$h.getPk()">$h.getTitle()</option>
-  #end
-</select><br />
-<br />
-#end
-
-</div>
-<br />
-</div>
-<br />
-</div>
-#parse("/layout/footer.vm")
-
+##
+## 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/HelpTop.vm")
+#set ($pageSelected = "help")
+#parse("/layout/header.vm")
+<div align="center" class="contentbox">
+<br /><br />
+
+<div class="projectbox">
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
+  <tr class="info" valign="top">
+    <td colspan=3>Help Items - <b>Help</b>
+    </td>
+    <td align="right">
+      #parse("Help/menu/global.vm")
+    </td>
+  </tr>
+</table>
+<br />
+
+<div class="messagebox">
+<SCRIPT LANGUAGE=javascript>
+  <!--
+  function OnChangeIn(dropdown)
+  {
+    var myindex = dropdown.selectedIndex;
+    var SelValue = dropdown.options[myindex].value;
+    var baseURL = "$appRoot/Help/details.vm?id=" + SelValue;
+    top.location.href = baseURL;
+
+    return true;
+  }
+  //-->
+</SCRIPT>
+#set ($id = $request.getParameter("id"))
+#set ($idNum = 1)
+
+#if($id)
+#set ($methodToCall = "UpdateHelpItem")
+#set ($helpItem = $helpHelper.getHelpItem($id))
+
+<br />
+<table>
+  <tr>
+    <td>
+      <b>Title:</b>
+    </td>
+    <td>
+      $!{helpItem.getTitle()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Topic:</b>
+    </td>
+    <td>
+      $!{helpItem.getTopic()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Subtopic:</b>
+    </td>
+    <td>
+      $!{helpItem.getSubtopic()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Summary:</b>
+    </td>
+    <td>
+      $!{helpItem.getSummary()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Keywords:</b>
+    </td>
+    <td>
+      $!{helpItem.getKeywordsForWeb()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Content:</b>
+    </td>
+    <td>
+      $!{helpItem.getContent()}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Function:<b/>
+    </td>
+    <td>
+      #foreach( $f in $User.getAllMyFunctions())
+      #if ($f.getPk() == $helpItem.getFunctionId())
+      #set ($name = $f.getName())
+      #end
+      #end
+      #if ($name)
+      $name <br />
+      #else
+      No Function Limitation<br />
+      #end
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <b>Valid:</b>
+    </td>
+    <td>
+      #if ($helpItem.isValid())
+      True
+      #else
+      False
+      #end
+      <br\>
+    </td>
+  </tr>
+</table>
+
+#if ($User.isAllowed("UpdateHelpItem") && $methodToCall == "UpdateHelpItem")
+<br\>
+<a href="$appRoot/Help/update.vm?id=$id">Update this Help Item</a> &nbsp;<br /><br />
+<br />
+#end
+
+#if ($User.isAllowed("DeleteHelpItem"))
+<form method="post" action='$link.setAction("help/HelpItemAction")' method="post">
+  <input type="hidden" name="id" value="$!{id}">
+  <input type="hidden" name="methodToCall" value="DeleteHelpItem">
+  #submit_button("Submit" "Delete" "button" "")
+</form>
+#end
+#else
+<br />
+Help Item:
+#set ($hs = $helpHelper.getHelpItems())
+<select name=id onchange='OnChangeIn(this);'>
+  <option value="">Select one
+    #foreach ($h in $hs)
+  <option value="$h.getPk()">$h.getTitle()</option>
+  #end
+</select><br />
+<br />
+#end
+
+</div>
+<br />
+</div>
+<br />
+</div>
+#parse("/layout/footer.vm")
+

Modified: incubator/lokahi/lokahi/trunk/src/www/Help/list.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/list.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/list.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/list.vm Mon Jul 17 09:39:25 2006
@@ -1,42 +1,45 @@
-##
-## 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 (!$collection)
-#set ($menu = "/layout/menu/HelpTop.vm")
-#set ($pageSelected = "Help")
-#parse("/layout/header.vm")
-#set ($plf = "true")
-#if ($request.getParameter("id"))
-#set ($id = $request.getParameter("id"))
-#set ($individual = $helpHelper.getHelpItem($id))
-#set ($indivPage = "/Help/confirm.vm")
-#else
-#set ($collection = $helpHelper.getHelpItems())
-#end
-#end
-#set ($entity = "Help")
-#set ($category = "Help Items")
-#set ($usesEnv = "false")
-#set ($path = "Help")
-#if (!$currentPage)
-#set ($currentPage = "$appRoot/Help/list.vm")
-#end
-
-#parse("/layout/list2.vm")
-#if ($plf)
-#parse("/layout/footer.vm")
-#end
+##
+## 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/HelpTop.vm")
+#set ($pageSelected = "Help")
+#parse("/layout/header.vm")
+#set ($plf = "true")
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#set ($individual = $helpHelper.getHelpItem($id))
+#set ($indivPage = "/Help/confirm.vm")
+#else
+#set ($collection = $helpHelper.getHelpItems())
+#end
+#end
+#set ($entity = "Help")
+#set ($category = "Help Items")
+#set ($usesEnv = "false")
+#set ($path = "Help")
+#if (!$currentPage)
+#set ($currentPage = "$appRoot/Help/list.vm")
+#end
+
+#parse("/layout/list2.vm")
+#if ($plf)
+#parse("/layout/footer.vm")
+#end

Modified: incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/menu/global.vm Mon Jul 17 09:39:25 2006
@@ -1,25 +1,28 @@
-##
-## 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$
-##
-<select name=methodToCall onchange='OnChange(this);'>
-  <option value="" selected>Select Action
-  <option value="$appRoot/Help/add.vm">&nbsp;Add&nbsp;</option>
-  <option value="$appRoot/Help/details.vm">&nbsp;Details&nbsp;</option>
-  <option value="$appRoot/Help/update.vm">&nbsp;Update&nbsp;</option>
-  <option value="$appRoot/Help/delete.vm">&nbsp;Delete&nbsp;</option>
-</select>
-
+##
+## 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$
+##
+<select name=methodToCall onchange='OnChange(this);'>
+  <option value="" selected>Select Action
+  <option value="$appRoot/Help/add.vm">&nbsp;Add&nbsp;</option>
+  <option value="$appRoot/Help/details.vm">&nbsp;Details&nbsp;</option>
+  <option value="$appRoot/Help/update.vm">&nbsp;Update&nbsp;</option>
+  <option value="$appRoot/Help/delete.vm">&nbsp;Delete&nbsp;</option>
+</select>
+

Modified: incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Help/menu/indiv.vm Mon Jul 17 09:39:25 2006
@@ -1,31 +1,34 @@
-##
-## 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$
-##
-<select name=methodToCall onchange='OnChange(this);'>
-  <option value="" selected>Select Action
-    #if($page)
-  <option value="$appRoot/Help/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-  #else
-  <option value="$appRoot/Help/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
-  #end
-  #if($User.isAllowed("UpdateFile"))
-  <option value="$appRoot/Help/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
-  #end
-  #if($User.isAllowed("DeleteFile"))
-  <option value="$appRoot/Help/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
-  #end
-</select>
+##
+## 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$
+##
+<select name=methodToCall onchange='OnChange(this);'>
+  <option value="" selected>Select Action
+    #if($page)
+  <option value="$appRoot/Help/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #else
+  <option value="$appRoot/Help/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+  #end
+  #if($User.isAllowed("UpdateFile"))
+  <option value="$appRoot/Help/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+  #end
+  #if($User.isAllowed("DeleteFile"))
+  <option value="$appRoot/Help/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+  #end
+</select>

Modified: incubator/lokahi/lokahi/trunk/src/www/wap/confirm.wml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/wap/confirm.wml?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/wap/confirm.wml (original)
+++ incubator/lokahi/lokahi/trunk/src/www/wap/confirm.wml Mon Jul 17 09:39:25 2006
@@ -1,17 +1,20 @@
 ##
-## 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.
+## 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$
 ##

Modified: incubator/lokahi/lokahi/trunk/src/www/wap/details.wml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/wap/details.wml?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/wap/details.wml (original)
+++ incubator/lokahi/lokahi/trunk/src/www/wap/details.wml Mon Jul 17 09:39:25 2006
@@ -1,17 +1,20 @@
 ##
-## 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.
+## 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$
 ##

Modified: incubator/lokahi/lokahi/trunk/src/www/wap/home.wml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/wap/home.wml?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/wap/home.wml (original)
+++ incubator/lokahi/lokahi/trunk/src/www/wap/home.wml Mon Jul 17 09:39:25 2006
@@ -1,17 +1,20 @@
 ##
-## 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.
+## 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$
 ##

Modified: incubator/lokahi/lokahi/trunk/src/www/wap/index.wml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/wap/index.wml?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/wap/index.wml (original)
+++ incubator/lokahi/lokahi/trunk/src/www/wap/index.wml Mon Jul 17 09:39:25 2006
@@ -1,17 +1,20 @@
 ##
-## 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.
+## 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$
 ##

Modified: incubator/lokahi/lokahi/trunk/src/www/wap/redirect.wml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/wap/redirect.wml?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/wap/redirect.wml (original)
+++ incubator/lokahi/lokahi/trunk/src/www/wap/redirect.wml Mon Jul 17 09:39:25 2006
@@ -1,17 +1,20 @@
 ##
-## 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.
+## 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$
 ##

Modified: incubator/lokahi/lokahi/trunk/src/www/wap/results.wml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/wap/results.wml?rev=422760&r1=422759&r2=422760&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/wap/results.wml (original)
+++ incubator/lokahi/lokahi/trunk/src/www/wap/results.wml Mon Jul 17 09:39:25 2006
@@ -1,17 +1,20 @@
 ##
-## 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.
+## 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$
 ##



Mime
View raw message