Changeset 2370


Ignore:
Timestamp:
11/26/12 11:01:49 (12 years ago)
Author:
twagoo
Message:

Added a servlet that does a request on the secured part of the plate service. Configured spring security in spring-servlet.xml. It works, but not with the security filter specified in web.xml

Location:
ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/pom.xml

    r2366 r2370  
    381381                                <include>WEB-INF/shhaa.xml</include>
    382382                                <include>WEB-INF/applicationContext.xml</include>
     383                                <include>WEB-INF/spring-servlet.xml</include>
    383384                                <include>WEB-INF/spring-config/**</include>
    384385                                <include>META-INF/context.xml</include>

  • ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/webapp/WEB-INF/web.xml

    r1560 r2370  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<!--
    3         Configuration file for ComponentRegistry in NON-SHIBBOLIZED context,
     3 Configuration file for ComponentRegistry in NON-SHIBBOLIZED context,
    44        i.e. development or testing environments.
    55-->
    … …  
    99    <description>Clarin Metadata Component Registry</description>
    1010    <listener>
    11         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     11        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
    1212    </listener>
    1313    <filter>
    14         <filter-name>characterEncodingFilter</filter-name>
    15         <filter-class>clarin.cmdi.componentregistry.servlet.CharacterEncodingFilter</filter-class>
    16         <init-param>
    17             <param-name>encoding</param-name>
    18             <param-value>UTF-8</param-value>
    19         </init-param>
     14        <filter-name>characterEncodingFilter</filter-name>
     15        <filter-class>clarin.cmdi.componentregistry.servlet.CharacterEncodingFilter</filter-class>
     16        <init-param>
     17            <param-name>encoding</param-name>
     18            <param-value>UTF-8</param-value>
     19        </init-param>
    2020    </filter>
    2121    <filter-mapping>
    22         <filter-name>characterEncodingFilter</filter-name>
    23         <url-pattern>/*</url-pattern>
     22        <filter-name>characterEncodingFilter</filter-name>
     23        <url-pattern>/*</url-pattern>
    2424    </filter-mapping>
    2525    <filter>
    26         <filter-name>wicket.componentregistry</filter-name>
    27         <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
    28         <init-param>
    29             <param-name>applicationClassName</param-name>
    30             <param-value>clarin.cmdi.componentregistry.frontend.AdminApp</param-value>
    31         </init-param>
    32         <init-param>
    33             <param-name>configuration</param-name>
    34             <!--      <param-value>development</param-value>-->
    35             <param-value>deployment</param-value>
    36             <!-- you can override with -Dwicket.configuration=development -->
    37         </init-param>
     26        <filter-name>wicket.componentregistry</filter-name>
     27        <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
     28        <init-param>
     29            <param-name>applicationClassName</param-name>
     30            <param-value>clarin.cmdi.componentregistry.frontend.AdminApp</param-value>
     31        </init-param>
     32        <init-param>
     33            <param-name>configuration</param-name>
     34            <!--      <param-value>development</param-value>-->
     35            <param-value>deployment</param-value>
     36            <!-- you can override with -Dwicket.configuration=development -->
     37        </init-param>
    3838    </filter>
    3939    <filter-mapping>
    40         <filter-name>wicket.componentregistry</filter-name>
    41         <url-pattern>/admin/*</url-pattern>
     40        <filter-name>wicket.componentregistry</filter-name>
     41        <url-pattern>/admin/*</url-pattern>
    4242    </filter-mapping>
    4343    <servlet>
    44         <servlet-name>ComponentRegistry Web Application</servlet-name>
    45         <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
    46         <init-param>
    47             <param-name>com.sun.jersey.config.property.resourceConfigClass</param-name>
    48             <param-value>com.sun.jersey.api.core.ClassNamesResourceConfig</param-value>
    49         </init-param>
    50         <init-param>
    51             <param-name>com.sun.jersey.config.property.classnames</param-name>
    52             <param-value>com.sun.jersey.multipart.impl.FormDataMultiPartDispatchProvider;clarin.cmdi.componentregistry.rest.ComponentRegistryRestService</param-value>
    53         </init-param>
    54         <!--    <init-param>-->
    55         <!--      <param-name>com.sun.jersey.config.property.packages</param-name>-->
    56         <!--      <param-value>clarin.cmdi.componentregistry.rest</param-value>-->
    57         <!--    </init-param>-->
    58         <load-on-startup>1</load-on-startup>
     44        <servlet-name>ComponentRegistry Web Application</servlet-name>
     45        <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
     46        <init-param>
     47            <param-name>com.sun.jersey.config.property.resourceConfigClass</param-name>
     48            <param-value>com.sun.jersey.api.core.ClassNamesResourceConfig</param-value>
     49        </init-param>
     50        <init-param>
     51            <param-name>com.sun.jersey.config.property.classnames</param-name>
     52            <param-value>com.sun.jersey.multipart.impl.FormDataMultiPartDispatchProvider;clarin.cmdi.componentregistry.rest.ComponentRegistryRestService</param-value>
     53        </init-param>
     54        <!--    <init-param>-->
     55        <!--      <param-name>com.sun.jersey.config.property.packages</param-name>-->
     56        <!--      <param-value>clarin.cmdi.componentregistry.rest</param-value>-->
     57        <!--    </init-param>-->
     58        <load-on-startup>1</load-on-startup>
    5959    </servlet>
    6060    <servlet-mapping>
    61         <servlet-name>ComponentRegistry Web Application</servlet-name>
    62         <url-pattern>/rest/*</url-pattern>
     61        <servlet-name>ComponentRegistry Web Application</servlet-name>
     62        <url-pattern>/rest/*</url-pattern>
    6363    </servlet-mapping>
    6464    <servlet>
    65         <servlet-name>Isocat Servlet</servlet-name>
    66         <servlet-class>clarin.cmdi.componentregistry.servlet.IsocatServlet</servlet-class>
    67         <load-on-startup>1</load-on-startup>
     65        <servlet-name>Isocat Servlet</servlet-name>
     66        <servlet-class>clarin.cmdi.componentregistry.servlet.IsocatServlet</servlet-class>
     67        <load-on-startup>1</load-on-startup>
    6868    </servlet>
    6969    <servlet-mapping>
    70         <servlet-name>Isocat Servlet</servlet-name>
    71         <url-pattern>/isocat/*</url-pattern>
     70        <servlet-name>Isocat Servlet</servlet-name>
     71        <url-pattern>/isocat/*</url-pattern>
     72    </servlet-mapping> 
     73
     74    <context-param>
     75        <param-name>contextConfigLocation</param-name>
     76        <param-value>/WEB-INF/spring-servlet.xml, /WEB-INF/applicationContext.xml</param-value>
     77    </context-param>
     78
     79    <!-- enable Spring security -->
     80   
     81    <filter>
     82        <filter-name>springSecurityFilterChain</filter-name>
     83        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
     84    </filter>
     85 
     86    <filter-mapping>
     87        <filter-name>springSecurityFilterChain</filter-name>
     88        <url-pattern>/*</url-pattern>
     89    </filter-mapping> 
     90     
     91    <servlet>
     92        <servlet-name>spring</servlet-name>
     93        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
     94        <load-on-startup>1</load-on-startup>
     95    </servlet>
     96
     97    <servlet-mapping>
     98        <servlet-name>spring</servlet-name>
     99        <url-pattern>/foo/*</url-pattern>
    72100    </servlet-mapping>
     101   
     102    <!-- Disabled old security constraints, at the moment this is clashing with spring security -->
     103<!--   
    73104    <security-constraint>
    74         <display-name>ComponentRegistry web service</display-name>
    75         <web-resource-collection>
    76             <web-resource-name>ComponentRegistry edit</web-resource-name>
    77             <description/>
    78             <url-pattern>/rest/*</url-pattern>
    79             <http-method>DELETE</http-method>
    80             <http-method>PUT</http-method>
    81             <http-method>POST</http-method>
    82         </web-resource-collection>
    83         <auth-constraint>
    84             <role-name>tomcat</role-name>
    85         </auth-constraint>
     105        <display-name>ComponentRegistry web service</display-name>
     106        <web-resource-collection>
     107            <web-resource-name>ComponentRegistry edit</web-resource-name>
     108            <description/>
     109            <url-pattern>/rest/*</url-pattern>
     110            <http-method>DELETE</http-method>
     111            <http-method>PUT</http-method>
     112            <http-method>POST</http-method>
     113        </web-resource-collection>
     114        <auth-constraint>
     115            <role-name>tomcat</role-name>
     116        </auth-constraint>
    86117    </security-constraint>
    87118    <security-constraint>
    88         <display-name>ComponentRegistry SWF GET</display-name>
    89         <web-resource-collection>
    90             <web-resource-name>ComponentRegistry access</web-resource-name>
    91             <description/>
    92             <url-pattern>/*</url-pattern>
    93             <http-method>GET</http-method>
    94         </web-resource-collection>
    95         <auth-constraint>
    96             <role-name>tomcat</role-name>
    97         </auth-constraint>
     119        <display-name>ComponentRegistry SWF GET</display-name>
     120        <web-resource-collection>
     121            <web-resource-name>ComponentRegistry access</web-resource-name>
     122            <description/>
     123            <url-pattern>/*</url-pattern>
     124            <http-method>GET</http-method>
     125        </web-resource-collection>
     126        <auth-constraint>
     127            <role-name>tomcat</role-name>
     128        </auth-constraint>
    98129    </security-constraint>
    99130    <login-config>
    100         <auth-method>BASIC</auth-method>
     131        <auth-method>BASIC</auth-method>
    101132    </login-config>
    102133    <security-role>
    103         <description> The role that is required to log in to the Application </description>
    104         <role-name>tomcat</role-name>
    105     </security-role>
     134        <description> The role that is required to log in to the Application </description>
     135        <role-name>tomcat</role-name>
     136    </security-role>-->
    106137</web-app>

  • ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/webresources/WEB-INF/applicationContext.xml

    r1947 r2370  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    3         xmlns:context="http://www.springframework.org/schema/context"
    4         xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-2.5.xsd
     3       xmlns:context="http://www.springframework.org/schema/context"
     4       xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-2.5.xsd
    55                           http://www.springframework.org/schema/context classpath:/org/springframework/context/config/spring-context-2.5.xsd">
    66
Note: See TracChangeset for help on using the changeset viewer.