Changeset 623


Ignore:
Timestamp:
08/16/10 06:58:33 (14 years ago)
Author:
patdui
Message:
 
Location:
ComponentRegistry/trunk/ComponentRegistry/src/main
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • ComponentRegistry/trunk/ComponentRegistry/src/main/webapp/WEB-INF/web.xml

    r622 r623  
    2929 
    3030<!-- Make sure this one is declared before the wicket filter, the order matters. Shibboleth should trigger the login, before continuing with the wicket filter.-->
    31 <!--  <filter> -->
    32 <!--    <filter-name>AAIFilter</filter-name>-->
    33 <!--    <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class>-->
    34 <!--  </filter>-->
    35 <!--  <filter-mapping>-->
    36 <!--    <filter-name>AAIFilter</filter-name>-->
    37 <!--    <url-pattern>/*</url-pattern>-->
    38 <!--  </filter-mapping>-->
    39 <!--  <listener>-->
    40 <!--    <listener-class>de.mpg.aai.shhaa.config.ConfigContextListener</listener-class>-->
    41 <!--  </listener>-->
     31  <filter>
     32    <filter-name>AAIFilter</filter-name>
     33    <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class>
     34  </filter>
     35  <filter-mapping>
     36    <filter-name>AAIFilter</filter-name>
     37    <url-pattern>/*</url-pattern>
     38  </filter-mapping>
     39  <listener>
     40    <listener-class>de.mpg.aai.shhaa.config.ConfigContextListener</listener-class>
     41  </listener>
    4242
    4343  <filter>
    … …  
    8686
    8787
    88   <security-constraint>
    89     <display-name>ComponentRegistry web service</display-name>
    90     <web-resource-collection>
    91       <web-resource-name>ComponentRegistry edit</web-resource-name>
    92       <description></description>
    93       <url-pattern>/rest/*</url-pattern>
    94       <http-method>DELETE</http-method>
    95       <http-method>PUT</http-method>
    96       <http-method>POST</http-method>
    97     </web-resource-collection>
    98     <auth-constraint>
    99       <role-name>tomcat</role-name>
    100     </auth-constraint>
    101   </security-constraint>
    102   <security-constraint>
    103     <display-name>ComponentRegistry SWF GET</display-name>
    104     <web-resource-collection>
    105       <web-resource-name>ComponentRegistry access</web-resource-name>
    106       <description></description>
    107       <url-pattern>/*</url-pattern>
    108       <http-method>GET</http-method>
    109     </web-resource-collection>
    110     <auth-constraint>
    111       <role-name>tomcat</role-name>
    112     </auth-constraint>
    113   </security-constraint>
    114   <login-config>
    115     <auth-method>BASIC</auth-method>
    116   </login-config>
    117   <security-role>
    118     <description> The role that is required to log in to the Application </description>
    119     <role-name>tomcat</role-name>
    120   </security-role>
     88<!--  <security-constraint>-->
     89<!--    <display-name>ComponentRegistry web service</display-name>-->
     90<!--    <web-resource-collection>-->
     91<!--      <web-resource-name>ComponentRegistry edit</web-resource-name>-->
     92<!--      <description></description>-->
     93<!--      <url-pattern>/rest/*</url-pattern>-->
     94<!--      <http-method>DELETE</http-method>-->
     95<!--      <http-method>PUT</http-method>-->
     96<!--      <http-method>POST</http-method>-->
     97<!--    </web-resource-collection>-->
     98<!--    <auth-constraint>-->
     99<!--      <role-name>tomcat</role-name>-->
     100<!--    </auth-constraint>-->
     101<!--  </security-constraint>-->
     102<!--  <security-constraint>-->
     103<!--    <display-name>ComponentRegistry SWF GET</display-name>-->
     104<!--    <web-resource-collection>-->
     105<!--      <web-resource-name>ComponentRegistry access</web-resource-name>-->
     106<!--      <description></description>-->
     107<!--      <url-pattern>/*</url-pattern>-->
     108<!--      <http-method>GET</http-method>-->
     109<!--    </web-resource-collection>-->
     110<!--    <auth-constraint>-->
     111<!--      <role-name>tomcat</role-name>-->
     112<!--    </auth-constraint>-->
     113<!--  </security-constraint>-->
     114<!--  <login-config>-->
     115<!--    <auth-method>BASIC</auth-method>-->
     116<!--  </login-config>-->
     117<!--  <security-role>-->
     118<!--    <description> The role that is required to log in to the Application </description>-->
     119<!--    <role-name>tomcat</role-name>-->
     120<!--  </security-role>-->
    121121
    122122</web-app>

  • ComponentRegistry/trunk/ComponentRegistry/src/main/webresources/WEB-INF/applicationContext.xml

    r622 r623  
    1010        <value>Patrick Duin</value>
    1111        <value>patdui@mpi.nl</value>
    12         <value>tomcat</value>
     12<!--          <value>tomcat</value>-->
    1313      </set>
    1414    </property>
Note: See TracChangeset for help on using the changeset viewer.