Changeset 548


Ignore:
Timestamp:
06/28/10 07:10:18 (14 years ago)
Author:
patdui
Message:
  • added new xslt version2 to config
Location:
ComponentRegistry/trunk/ComponentRegistry/src/main
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/Configuration.java

    r537 r548  
    1616    //NOTE: Default values, can be overwritten in applicationContext.xml
    1717    private String generalComponentSchema = "http://www.clarin.eu/cmd/general-component-schema.xsd";
    18     private String component2SchemaXsl = "http://www.clarin.eu/cmd/comp2schema.xsl";
     18    private String component2SchemaXsl = "http://www.clarin.eu/cmd/xslt/comp2schema-v2/comp2schema.xsl";//"http://www.clarin.eu/cmd/comp2schema.xsl";
    1919    private String isocatRestUrl = "http://www.isocat.org/rest/";
    2020

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

    r537 r548  
    1616
    1717<!-- Make sure this one is declared first, the order matters. Shibboleth should trigger the login, before continuing with the wicket filter.-->
    18 <!--  <filter> -->
    19 <!--    <filter-name>AAIFilter</filter-name>-->
    20 <!--    <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class>-->
    21 <!--  </filter>-->
    22 <!--  <filter-mapping>-->
    23 <!--    <filter-name>AAIFilter</filter-name>-->
    24 <!--    <url-pattern>/*</url-pattern>-->
    25 <!--  </filter-mapping>-->
    26 <!--  <listener>-->
    27 <!--    <listener-class>de.mpg.aai.shhaa.config.ConfigContextListener</listener-class>-->
    28 <!--  </listener>-->
     18  <filter>
     19    <filter-name>AAIFilter</filter-name>
     20    <filter-class>de.mpg.aai.shhaa.AuthFilter</filter-class>
     21  </filter>
     22  <filter-mapping>
     23    <filter-name>AAIFilter</filter-name>
     24    <url-pattern>/*</url-pattern>
     25  </filter-mapping>
     26  <listener>
     27    <listener-class>de.mpg.aai.shhaa.config.ConfigContextListener</listener-class>
     28  </listener>
    2929
    3030  <filter>
    … …  
    7373
    7474
    75   <security-constraint>
    76     <display-name>ComponentRegistry web service</display-name>
    77     <web-resource-collection>
    78       <web-resource-name>ComponentRegistry edit</web-resource-name>
    79       <description></description>
    80       <url-pattern>/rest/*</url-pattern>
    81       <http-method>DELETE</http-method>
    82       <http-method>PUT</http-method>
    83       <http-method>POST</http-method>
    84     </web-resource-collection>
    85     <auth-constraint>
    86       <role-name>tomcat</role-name>
    87     </auth-constraint>
    88   </security-constraint>
    89   <security-constraint>
    90     <display-name>ComponentRegistry SWF GET</display-name>
    91     <web-resource-collection>
    92       <web-resource-name>ComponentRegistry access</web-resource-name>
    93       <description></description>
    94       <url-pattern>/*</url-pattern>
    95       <http-method>GET</http-method>
    96     </web-resource-collection>
    97     <auth-constraint>
    98       <role-name>tomcat</role-name>
    99     </auth-constraint>
    100   </security-constraint>
    101   <login-config>
    102     <auth-method>BASIC</auth-method>
    103   </login-config>
    104   <security-role>
    105     <description> The role that is required to log in to the Application </description>
    106     <role-name>tomcat</role-name>
    107   </security-role>
     75<!--  <security-constraint>-->
     76<!--    <display-name>ComponentRegistry web service</display-name>-->
     77<!--    <web-resource-collection>-->
     78<!--      <web-resource-name>ComponentRegistry edit</web-resource-name>-->
     79<!--      <description></description>-->
     80<!--      <url-pattern>/rest/*</url-pattern>-->
     81<!--      <http-method>DELETE</http-method>-->
     82<!--      <http-method>PUT</http-method>-->
     83<!--      <http-method>POST</http-method>-->
     84<!--    </web-resource-collection>-->
     85<!--    <auth-constraint>-->
     86<!--      <role-name>tomcat</role-name>-->
     87<!--    </auth-constraint>-->
     88<!--  </security-constraint>-->
     89<!--  <security-constraint>-->
     90<!--    <display-name>ComponentRegistry SWF GET</display-name>-->
     91<!--    <web-resource-collection>-->
     92<!--      <web-resource-name>ComponentRegistry access</web-resource-name>-->
     93<!--      <description></description>-->
     94<!--      <url-pattern>/*</url-pattern>-->
     95<!--      <http-method>GET</http-method>-->
     96<!--    </web-resource-collection>-->
     97<!--    <auth-constraint>-->
     98<!--      <role-name>tomcat</role-name>-->
     99<!--    </auth-constraint>-->
     100<!--  </security-constraint>-->
     101<!--  <login-config>-->
     102<!--    <auth-method>BASIC</auth-method>-->
     103<!--  </login-config>-->
     104<!--  <security-role>-->
     105<!--    <description> The role that is required to log in to the Application </description>-->
     106<!--    <role-name>tomcat</role-name>-->
     107<!--  </security-role>-->
    108108
    109109</web-app>

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

    r478 r548  
    99      <set>
    1010        <value>Patrick Duin</value>
     11   <!--     <value>Patrick</value>-->
    1112      </set>
    1213    </property>
    1314    <property name="generalComponentSchema" value="http://www.clarin.eu/cmd/general-component-schema.xsd" />
    14     <property name="component2SchemaXsl" value="http://www.clarin.eu/cmd/comp2schema.xsl" />
     15    <!-- <property name="component2SchemaXsl" value="http://www.clarin.eu/cmd/comp2schema.xsl" />-->
     16    <property name="component2SchemaXsl" value="http://www.clarin.eu/cmd/xslt/comp2schema-v2/comp2schema.xsl"/>
    1517    <property name="componentSpecSchemaLocation" value="http://www.clarin.eu/cmd http://www.clarin.eu/cmd/general-component-schema.xsd" />
    1618    <property name="isocatRestUrl" value="http://www.isocat.org/rest/" />
Note: See TracChangeset for help on using the changeset viewer.