incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r417276 - in /incubator/lokahi/lokahi/trunk: conf/struts-config.xml src/www/Core/index.vm src/www/layout/menu/top.vm
Date Mon, 26 Jun 2006 18:40:16 GMT
Author: toback
Date: Mon Jun 26 11:40:16 2006
New Revision: 417276

URL: http://svn.apache.org/viewvc?rev=417276&view=rev
Log:
Fix to struts config, the apache httpd mappings were pointing to the wrong module.

added /Core/index.vm to fix an issue when viewed from IE.

Changed the top.vm  "TMC" -> "Lokahi"

Added:
    incubator/lokahi/lokahi/trunk/src/www/Core/index.vm
Modified:
    incubator/lokahi/lokahi/trunk/conf/struts-config.xml
    incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm

Modified: incubator/lokahi/lokahi/trunk/conf/struts-config.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/struts-config.xml?rev=417276&r1=417275&r2=417276&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/struts-config.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/struts-config.xml Mon Jun 26 11:40:16 2006
@@ -342,7 +342,7 @@
     <forward name="application.forward.login" path="/index.vm"/>
     <forward name="wap.failure.action" path="/wap/redirect.wml?path=/wap/results.wml"/>
     <forward name="wap.success.action" path="/wap/redirect.wml?path=/wap/results.wml"/>
-    <forward name="wap.failure" path="/wap/redirect.wml?path=/wap/index.wml"/>    
       
+    <forward name="wap.failure" path="/wap/redirect.wml?path=/wap/index.wml"/>
   </global-forwards>
 
 
@@ -389,15 +389,15 @@
       scope="request"
       validate="true"
       />
-    <action path="/ApachePool/SubmitJobAction" type="org.apache.lokahi.tomcat.gui.www.ApachePoolAction"
name="ApachePoolMultipleForm" scope="request" validate="true" />
-    <action path="/ApacheWorker/SubmitJobAction" type="org.apache.lokahi.tomcat.gui.www.ApacheWorkerAction"
name="ApacheWorkerMultipleForm" scope="request" validate="true" />
+    <action path="/ApachePool/SubmitJobAction" type="org.apache.lokahi.httpd.gui.www.ApachePoolAction"
name="ApachePoolMultipleForm" scope="request" validate="true" />
+    <action path="/ApacheWorker/SubmitJobAction" type="org.apache.lokahi.httpd.gui.www.ApacheWorkerAction"
name="ApacheWorkerMultipleForm" scope="request" validate="true" />
     <action path="/Context/SubmitJobAction" type="org.apache.lokahi.tomcat.gui.www.ContextAction"
name="ContextMultipleForm" scope="request" validate="true" />
     <action path="/HostingPool/SubmitJobAction" type="org.apache.lokahi.core.gui.www.HostingPoolAction"
name="HostingPoolMultipleForm" scope="request" validate="true" />
     <action path="/TomcatPool/SubmitJobAction" type="org.apache.lokahi.tomcat.gui.www.TomcatPoolAction"
name="TomcatPoolMultipleForm" scope="request" validate="true" />
     <action path="/TomcatWorker/SubmitJobAction" type="org.apache.lokahi.tomcat.gui.www.TomcatWorkerAction"
name="TomcatWorkerMultipleForm" scope="request" validate="true" />
-    <action path="/administration/Apache/Delete" type="org.apache.lokahi.tomcat.gui.www.ApacheAction"
name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/ApachePool/Delete" type="org.apache.lokahi.tomcat.gui.www.ApachePoolAction"
name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/ApacheWorker/Delete" type="org.apache.lokahi.tomcat.gui.www.ApacheWorkerAction"
name="DeleteForm" scope="request" validate="true" />
+    <action path="/administration/Apache/Delete" type="org.apache.lokahi.httpd.gui.www.ApacheAction"
name="DeleteForm" scope="request" validate="true" />
+<action path="/administration/ApachePool/Delete" type="org.apache.lokahi.httpd.gui.www.ApachePoolAction"
name="DeleteForm" scope="request" validate="true" />
+<action path="/administration/ApacheWorker/Delete" type="org.apache.lokahi.httpd.gui.www.ApacheWorkerAction"
name="DeleteForm" scope="request" validate="true" />
 <action path="/administration/Context/Delete" type="org.apache.lokahi.tomcat.gui.www.ContextAction"
name="DeleteForm" scope="request" validate="true" />
 <action path="/administration/Environment/Delete" type="org.apache.lokahi.core.gui.www.EnvironmentAction"
name="DeleteForm" scope="request" validate="true" />
 <action path="/administration/File/Delete" type="org.apache.lokahi.core.gui.www.FileAction"
name="DeleteForm" scope="request" validate="true" />
@@ -409,7 +409,7 @@
 <action path="/administration/TomcatPool/Delete" type="org.apache.lokahi.tomcat.gui.www.TomcatPoolAction"
name="DeleteForm" scope="request" validate="true" />
 <action path="/administration/TomcatWorker/Delete" type="org.apache.lokahi.tomcat.gui.www.TomcatWorkerAction"
name="DeleteForm" scope="request" validate="true" />
 <action path="/administration/User/Delete" type="org.apache.lokahi.core.gui.www.UserAction"
name="DeleteForm" scope="request" validate="true" />
-<action path="/administration/VirtualHost/Delete" type="org.apache.lokahi.tomcat.gui.www.VirtualHostAction"
name="DeleteForm" scope="request" validate="true" />
+<action path="/administration/VirtualHost/Delete" type="org.apache.lokahi.httpd.gui.www.VirtualHostAction"
name="DeleteForm" scope="request" validate="true" />
     <action
       path="/templating/*Action"
       type="org.apache.lokahi.core.gui.www.TemplateAction"

Added: incubator/lokahi/lokahi/trunk/src/www/Core/index.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/index.vm?rev=417276&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/index.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/index.vm Mon Jun 26 11:40:16 2006
@@ -0,0 +1,18 @@
+##
+## 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$
+##
+#parse("/Core/infrastructure.vm")

Modified: incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm?rev=417276&r1=417275&r2=417276&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/layout/menu/top.vm Mon Jun 26 11:40:16 2006
@@ -27,7 +27,7 @@
    #else
      <li>
    #end
-   <a href="$appRoot/index.vm">TMC</a></li>
+   <a href="$appRoot/index.vm">Lokahi</a></li>
    #if ($topSelected == "projects")
      <li id="current">
    #else
@@ -39,7 +39,7 @@
       <li id="current">
      #else
       <li>
-     #end     
+     #end
      <a href="$appRoot/Core/User/index.vm">Administration</a></li>
   #end
   #if($User.isAllowed("AddHostingPool") || $User.isAllowed("ViewHostingPool") || $User.isAllowed("UpdateHostingPool")
|| $User.isAllowed("DeleteHostingPool") || $User.isAllowed("AddApachePool") || $User.isAllowed("ViewApachePool")
|| $User.isAllowed("UpdateApachePool") || $User.isAllowed("DeleteApachePool") || $User.isAllowed("AddTomcatPool")
|| $User.isAllowed("ViewTomcatPool") || $User.isAllowed("UpdateTomcatPool") || $User.isAllowed("DeleteTomcatPool"))



Mime
View raw message