You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2004/07/30 20:48:16 UTC

cvs commit: jakarta-pluto/testsuite/src/webapp/WEB-INF web.xml portlet.xml

ddewolf     2004/07/30 11:48:15

  Modified:    testsuite/src/webapp/WEB-INF portlet.xml
  Added:       testsuite/src/webapp/WEB-INF web.xml
  Log:
  Fixing Issue: PLUTO-46.  isUserInRole now checks security-role-ref as declared in portlet.xml.  Also including new test portlet page for testing security info like this.
  
  Revision  Changes    Path
  1.3       +11 -2     jakarta-pluto/testsuite/src/webapp/WEB-INF/portlet.xml
  
  Index: portlet.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-pluto/testsuite/src/webapp/WEB-INF/portlet.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- portlet.xml	2 Mar 2004 15:02:56 -0000	1.2
  +++ portlet.xml	30 Jul 2004 18:48:15 -0000	1.3
  @@ -58,8 +58,13 @@
   				<value>dummyValue2</value>
   			</preference>
               <preferences-validator>org.apache.pluto.core.impl.PreferencesValidatorImpl</preferences-validator>
  -        </portlet-preferences>        
  +        </portlet-preferences>
  +        <security-role-ref>
  +            <role-name>plutoTestRole</role-name>
  +            <role-link>tomcat</role-link>
  +        </security-role-ref>
   	</portlet>
  +
   	<portlet>
           <description>TestSuiteDescription</description>
   		
  @@ -102,6 +107,10 @@
   				<value>dummyValue2</value>
   			</preference>
               <preferences-validator>org.apache.pluto.core.impl.PreferencesValidatorImpl</preferences-validator>
  -        </portlet-preferences>        
  +        </portlet-preferences>
  +        <security-role-ref>
  +          <role-name>plutoTestRole</role-name>
  +          <role-link>tomcat</role-link>
  +        </security-role-ref>
   	</portlet>
    </portlet-app>
  
  
  
  1.1                  jakarta-pluto/testsuite/src/webapp/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <!DOCTYPE web-app
      PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
             "http://java.sun.com/dtd/web-app_2_3.dtd">
  <!-- 
  Copyright 2004 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.
  -->
  <web-app>
  
      <display-name>Pluto Testsuite</display-name>
  
      <security-role>
          <role-name>tomcat</role-name>
      </security-role>
  
  </web-app>