Changeset 2412

Timestamp:

12/12/12 08:17:48 (11 years ago)

Author:

twagoo

Message:

Merged: updated locations of XSD and XSLTs (https to prevent redirect from http which causes issues with Saxon)

Location:

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry

Files:

• . (modified) (1 prop)
• src/main/binding (modified) (1 prop)
• src/main/binding/components/bindings.xjb (modified) (1 prop)
• src/main/java (modified) (1 prop)
• src/main/webresources/WEB-INF/spring-config/component-registry.xml (modified) (1 diff)
• src/test/resources/spring-config/component-registry.xml (modified) (1 diff)

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/webresources/WEB-INF/spring-config/component-registry.xml

@@ -14 +14 @@
         <!-- Read admin users from init param -->
         <property name="adminUsersList" value="${componentRegistryAdminUsers}" />
-        <property name="generalComponentSchema" value="http://www.clarin.eu/cmd/general-component-schema.xsd" />
-        <property name="component2SchemaXsl" value="http://www.clarin.eu/cmd/xslt/comp2schema-v2/comp2schema.xsl"/>
-        <property name="componentSpecSchemaLocation" value="http://www.clarin.eu/cmd http://www.clarin.eu/cmd/general-component-schema.xsd" />
+        <property name="generalComponentSchema" value="https://www.clarin.eu/cmd/general-component-schema.xsd" />
+        <property name="component2SchemaXsl" value="https://www.clarin.eu/cmd/xslt/comp2schema-v2/comp2schema.xsl"/>
+        <property name="componentSpecSchemaLocation" value="http://www.clarin.eu/cmd https://www.clarin.eu/cmd/general-component-schema.xsd" />
         <!-- TODO: Read the following from a context parameter -->
         <property name="isocatRestUrl" value="http://lux16.mpi.nl/isocat/rest/" />

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/test/resources/spring-config/component-registry.xml

@@ -8 +8 @@
 
 <!--    <property name="generalComponentSchema" value="http://www.clarin.eu/cmd/general-component-schema.xsd" />-->
-        <property name="generalComponentSchema" value="http://lux16.mpi.nl/general-component-schema.xsd" />     
+        <property name="generalComponentSchema" value="https://www.clarin.eu/cmd/general-component-schema.xsd" />       
 <!--    <property name="componentSpecSchemaLocation" value="http://www.clarin.eu/cmd http://www.clarin.eu/cmd/general-component-schema.xsd" />-->
-        <property name="componentSpecSchemaLocation" value="http://www.clarin.eu/cmd http://lux16.mpi.nl/general-component-schema.xsd" />
+        <property name="componentSpecSchemaLocation" value="http://www.clarin.eu/cmd https://www.clarin.eu/cmd/general-component-schema.xsd" />
 
-        <property name="component2SchemaXsl" value="http://www.clarin.eu/cmd/xslt/comp2schema-v2/comp2schema.xsl"/>
+        <property name="component2SchemaXsl" value="https://www.clarin.eu/cmd/xslt/comp2schema-v2/comp2schema.xsl"/>
 
         <property name="isocatRestUrl" value="http://www.isocat.org/rest/" />