Return-Path: 
 <tomcat-dev-return-10282-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 38222 invoked from network); 3 May 2002 07:17:12 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 3 May 2002 07:17:12 -0000
Received: (qmail 29222 invoked by uid 97); 3 May 2002 07:17:17 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org
Received: (qmail 29141 invoked by alias); 3 May 2002 07:17:17 -0000
Delivered-To: jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 29101 invoked by uid 97); 3 May 2002 07:17:16 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 29090 invoked by alias); 3 May 2002 07:17:15 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 3 May 2002 07:16:58 -0000
Message-ID: <20020503071658.78605.qmail@icarus.apache.org>
From: manveen@apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jdbcRealm.jsp
 jndiRealm.jsp memoryRealm.jsp userDatabaseRealm.jsp
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

manveen     02/05/03 00:16:58

  Modified:    webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp
                        memoryRealm.jsp userDatabaseRealm.jsp
  Log:
  Add a check if the realm can be deleted or not.
  
  Revision  Changes    Path
  1.4       +4 -1      jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp
  
  Index: jdbcRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jdbcRealm.jsp	24 Mar 2002 04:13:24 -0000	1.3
  +++ jdbcRealm.jsp	3 May 2002 07:16:58 -0000	1.4
  @@ -23,6 +23,7 @@
     <html:hidden property="adminAction"/>
     <html:hidden property="parentObjectName"/>
     <html:hidden property="objectName"/>
  +  <html:hidden property="allowDeletion"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  @@ -42,10 +43,12 @@
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
               <logic:notEqual name="jdbcRealmForm" property="adminAction" value="Create">              
  +            <logic:notEqual name="userDatabaseRealmForm" property="allowDeletion" value="false">  
                <controls:action url='<%= "/DeleteRealm.do?select=" + 
                                           URLEncoder.encode(thisObjectName) %>'>  
                   <bean:message key="actions.realms.delete"/> 
  -              </controls:action>           
  +              </controls:action>   
  +               </logic:notEqual>
                </logic:notEqual>          
          </controls:actions>   
            </div>
  
  
  
  1.4       +4 -1      jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp
  
  Index: jndiRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jndiRealm.jsp	24 Mar 2002 04:13:24 -0000	1.3
  +++ jndiRealm.jsp	3 May 2002 07:16:58 -0000	1.4
  @@ -22,6 +22,7 @@
     <html:hidden property="adminAction"/>
     <html:hidden property="objectName"/>
     <html:hidden property="parentObjectName"/>
  +  <html:hidden property="allowDeletion"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  @@ -41,11 +42,13 @@
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
               <logic:notEqual name="jndiRealmForm" property="adminAction" value="Create">              
  +                <logic:notEqual name="userDatabaseRealmForm" property="allowDeletion" value="false">  
                   <controls:action url='<%= "/DeleteRealm.do?select=" + 
                                           URLEncoder.encode(thisObjectName) %>'>  
                   <bean:message key="actions.realms.delete"/> 
               </controls:action>           
  -           </logic:notEqual>          
  +           </logic:notEqual>  
  +        </logic:notEqual>
          </controls:actions>   
            </div>
         </td>
  
  
  
  1.4       +3 -0      jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp
  
  Index: memoryRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- memoryRealm.jsp	24 Mar 2002 04:13:24 -0000	1.3
  +++ memoryRealm.jsp	3 May 2002 07:16:58 -0000	1.4
  @@ -23,6 +23,7 @@
     <html:hidden property="parentObjectName"/>
     <html:hidden property="adminAction"/>
     <html:hidden property="objectName"/>
  +  <html:hidden property="allowDeletion"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  @@ -42,10 +43,12 @@
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
               <logic:notEqual name="memoryRealmForm" property="adminAction" value="Create">              
  +                <logic:notEqual name="userDatabaseRealmForm" property="allowDeletion" value="false">  
                   <controls:action url='<%= "/DeleteRealm.do?select=" + 
                                           URLEncoder.encode(thisObjectName) %>'>  
                   <bean:message key="actions.realms.delete"/> 
                   </controls:action>           
  +            </logic:notEqual>
               </logic:notEqual>
          </controls:actions>   
            </div>
  
  
  
  1.4       +4 -1      jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp
  
  Index: userDatabaseRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- userDatabaseRealm.jsp	24 Mar 2002 04:13:24 -0000	1.3
  +++ userDatabaseRealm.jsp	3 May 2002 07:16:58 -0000	1.4
  @@ -23,6 +23,7 @@
     <html:hidden property="parentObjectName"/>
     <html:hidden property="adminAction"/>
     <html:hidden property="objectName"/>
  +  <html:hidden property="allowDeletion"/>
   
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
       <tr bgcolor="7171A5">
  @@ -41,11 +42,13 @@
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <logic:notEqual name="userDatabaseRealmForm" property="adminAction" value="Create">              
  +            <logic:notEqual name="userDatabaseRealmForm" property="adminAction" value="Create">                              
  +                <logic:notEqual name="userDatabaseRealmForm" property="allowDeletion" value="false">  
                   <controls:action url='<%= "/DeleteRealm.do?select=" + 
                                           URLEncoder.encode(thisObjectName) %>'>  
                   <bean:message key="actions.realms.delete"/> 
               </controls:action>           
  +           </logic:notEqual>          
              </logic:notEqual>          
          </controls:actions>   
            </div>
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>