continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r465006 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ java/org/apache/maven/continuum/web/action/admin/ resources/ webapp/WEB-INF/jsp/ webapp/WEB-INF/jsp/admin/ webapp/WEB-INF/jsp/navigat...
Date Tue, 17 Oct 2006 19:15:12 GMT
Author: jmcconnell
Date: Tue Oct 17 12:15:10 2006
New Revision: 465006

URL: http://svn.apache.org/viewvc?view=rev&rev=465006
Log:
added an /admin namespace and moved the configuration pages into it

Added:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
  (contents, props changed)
      - copied, changed from r464951, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
  (contents, props changed)
      - copied, changed from r464998, maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/configuration.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
  (contents, props changed)
      - copied, changed from r464998, maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/configurationEdit.jsp
Removed:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/configuration.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/configurationEdit.jsp
Modified:
    maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp

Copied: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
(from r464951, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java)
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java?view=diff&rev=465006&p1=maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java&r1=464951&p2=maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java&r2=465006
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
Tue Oct 17 12:15:10 2006
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.web.action;
+package org.apache.maven.continuum.web.action.admin;
 
 /*
  * Copyright 2004-2006 The Apache Software Foundation.
@@ -22,6 +22,7 @@
 import org.apache.maven.continuum.security.ContinuumRoleConstants;
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
 import org.codehaus.plexus.security.policy.UserSecurityPolicy;
 import org.codehaus.plexus.security.rbac.Resource;
 import org.codehaus.plexus.security.system.SecuritySystem;

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=465006&r1=465005&r2=465006
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Tue Oct 17 12:15:10
2006
@@ -59,6 +59,7 @@
       
       <result name="continuum-configuration-required" type="redirect-action">
         <param name="actionName">configuration</param>
+        <param name="namespace">/admin</param>
         <param name="method">input</param>
       </result>
 
@@ -115,11 +116,7 @@
       <result name="success">/WEB-INF/jsp/about.jsp</result>
     </action>
 
-    <action name="configuration" class="configuration">
-      <interceptor-ref name="unconfiguredContinuumStack"/>
-      <result name="input">/WEB-INF/jsp/configurationEdit.jsp</result>
-      <result name="success">/WEB-INF/jsp/configuration.jsp</result>
-    </action>
+
    
     <action name="companyInfo" class="configuration">
       <result name="success">/WEB-INF/jsp/components/companyLogo.jsp</result>
@@ -403,6 +400,24 @@
 
     <action name="releaseViewResult" class="releaseInProgress" method="viewResult">
       <result name="success">/WEB-INF/jsp/releaseViewResult.jsp</result>
+    </action>
+
+  </package>
+
+  <!--
+  |
+  | admin actions
+  |
+  | administrative secured actions ought to be placed in here so there is a clear seperation
between secured
+  | actions and others
+  |
+  -->
+  <package name="admin" extends="default">
+
+    <action name="configuration" class="configuration">
+      <interceptor-ref name="unconfiguredContinuumStack"/>
+      <result name="input">/WEB-INF/jsp/admin/configurationEdit.jsp</result>
+      <result name="success">/WEB-INF/jsp/admin/configuration.jsp</result>
     </action>
 
   </package>

Copied: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
(from r464998, maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/configuration.jsp)
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp?view=diff&rev=465006&p1=maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/configuration.jsp&r1=464998&p2=maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp&r2=465006
==============================================================================
    (empty)

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Copied: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
(from r464998, maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/configurationEdit.jsp)
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp?view=diff&rev=465006&p1=maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/configurationEdit.jsp&r1=464998&p2=maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp&r2=465006
==============================================================================
    (empty)

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?view=diff&rev=465006&r1=465005&r2=465006
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
Tue Oct 17 12:15:10 2006
@@ -8,11 +8,11 @@
     <div class="label">Continuum</div>
     <div>
       <div class="body">
-        <ww:url id="aboutUrl" action="about" includeParams="none"/>
+        <ww:url id="aboutUrl" action="about" namespace="/" includeParams="none"/>
         <ww:a href="%{aboutUrl}"><ww:text name="menu.continuum.about"/></ww:a>
       </div>
       <div class="body">
-        <ww:url id="groupSummaryUrl" action="groupSummary" includeParams="none"/>
+        <ww:url id="groupSummaryUrl" action="groupSummary" namespace="/" includeParams="none"/>
         <ww:a href="%{groupSummaryUrl}"><ww:text name="menu.continuum.showProjectGroups"/></ww:a>
       </div>
     </div>
@@ -23,21 +23,21 @@
       <div class="label"><ww:text name="menu.addProject"/></div>
       <div>
         <div class="body">
-          <ww:url id="addMavenTwoProjectUrl" action="addMavenTwoProject" includeParams="none"/>
+          <ww:url id="addMavenTwoProjectUrl" action="addMavenTwoProject" namespace="/"
includeParams="none"/>
           <ww:a href="%{addMavenTwoProjectUrl}"><ww:text name="menu.add.m2Project"/></ww:a>
         </div>
         <div class="body">
-          <ww:url id="addMavenOneProjectUrl" action="addMavenOneProject" includeParams="none"/>
+          <ww:url id="addMavenOneProjectUrl" action="addMavenOneProject" namespace="/"
includeParams="none"/>
           <ww:a href="%{addMavenOneProjectUrl}"><ww:text name="menu.add.m1Project"/></ww:a>
         </div>
         <div class="body">
-          <ww:url id="addAntProjectUrl" action="addProjectInput" includeParams="none">
+          <ww:url id="addAntProjectUrl" action="addProjectInput" namespace="/" includeParams="none">
             <ww:param name="projectType">ant</ww:param>
           </ww:url>
           <ww:a href="%{addAntProjectUrl}"><ww:text name="menu.add.antProject"/></ww:a>
         </div>
         <div class="body">
-          <ww:url id="addShellProjectUrl" action="addProjectInput" includeParams="none">
+          <ww:url id="addShellProjectUrl" action="addProjectInput" namespace="/" includeParams="none">
             <ww:param name="projectType">shell</ww:param>
           </ww:url>
           <ww:a href="%{addShellProjectUrl}"><ww:text name="menu.add.shellProject"/></ww:a>
@@ -51,13 +51,13 @@
     <div class="label"><ww:text name="menu.administration"/></div>
     <div>
       <pss:ifAuthorized permission="continuum-manage-schedules">
-        <ww:url id="scheduleUrl" action="schedules"/>
+        <ww:url id="scheduleUrl" namespace="/" action="schedules"/>
         <div class="body">
           <ww:a href="%{scheduleUrl}"><ww:text name="menu.administration.schedules"/></ww:a>
         </div>
       </pss:ifAuthorized>
       <pss:ifAuthorized permission="continuum-manage-configuration">
-        <ww:url id="configurationUrl" action="configuration" method="default"/>
+        <ww:url id="configurationUrl" action="configuration" namespace="/admin" method="default"/>
         <div class="body">
           <ww:a href="%{configurationUrl}"><ww:text name="menu.administration.configuration"/></ww:a>
         </div>



Mime
View raw message