Changeset 2414

Timestamp:

12/12/12 08:55:41 (11 years ago)

Author:

twagoo

Message:

Merged: Switched back to general component schema on lux16 that has schematron rules

Location:

ComponentRegistry/branches

Files:

• ComponentRegistry-1.13.0-olha (modified) (1 prop)
• ComponentRegistry-1.13.0-olha/CHANGES (modified) (1 prop)
• ComponentRegistry-1.13.0-olha/CMDValidate (modified) (1 prop)
• ComponentRegistry-1.13.0-olha/ComponentBrowserGui (modified) (1 prop)
• ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/resources (modified) (1 prop)
• ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/resources/spring-config/component-registry.xml (modified) (1 diff)
• ComponentRegistry-1.13.0-olha/INSTALL (modified) (1 prop)
• ComponentRegistry-1.13.0-olha/README (modified) (1 diff, 1 prop)
• ComponentRegistry-1.13.0-olha/UPDATE (modified) (1 prop)
• ComponentRegistry-1.13.0-olha/docs (modified) (1 prop)
• ComponentRegistry-1.13.0-olha/docs/ComponentRegistryReferenceManual.docx (modified) (previous)
• ComponentRegistry-1.13.0-olha/docs/WebServices for the CLARIN Component Registry.docx (modified) (previous)
• ComponentRegistry-1.13.0-olha/pom.xml (modified) (1 prop)
• ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/servlet/OAuthHandshakeServlet.java (modified) (1 diff)
• ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/test/resources (modified) (1 prop)
• ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/test/resources/spring-config/component-registry.xml (modified) (1 diff)

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

@@ -7 +7 @@
         <property name="adminUsersList" value="JUnit.Admin@test.com" />
 
-<!--    <property name="generalComponentSchema" value="http://www.clarin.eu/cmd/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 https://www.clarin.eu/cmd/general-component-schema.xsd" />
+<!--    <property name="generalComponentSchema" value="https://www.clarin.eu/cmd/general-component-schema.xsd" />-->
+<!--    Schema on LUX16 contains Schematron rules, not yet in production... -->
+        <property name="generalComponentSchema" value="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="componentSpecSchemaLocation" value="http://www.clarin.eu/cmd http://lux16.mpi.nl/general-component-schema.xsd" />
 
         <property name="component2SchemaXsl" value="https://www.clarin.eu/cmd/xslt/comp2schema-v2/comp2schema.xsl"/>

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/README

@@ -45 +45 @@
 When using FlashBuilder to develop, make sure to configure the correct Flex SDK. It should
 be version 3.6, which you can download for free at <http://www.adobe.com/cfusion/entitlement/index.cfm?e=flex3sdk>.
+In addition, you should configure the project to build for Flash player 10.0.0 (instead of default minimum version
+provided by SDK).
 
 * Creating war artifact for local deployment:

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/servlet/OAuthHandshakeServlet.java

@@ -35 +35 @@
     @RequestMapping(value = "/connect")
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        oauth2RestService.getAccessToken();
+        if (!"false".equalsIgnoreCase(req.getParameter("acquire"))) {
+            oauth2RestService.getAccessToken();
+        }
         resp.getWriter().write(String.format("%s", oauth2RestService.getOAuth2ClientContext().getAccessToken()));
         resp.flushBuffer();

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

@@ -7 +7 @@
         <property name="adminUsersList" value="JUnit.Admin@test.com" />
 
-<!--    <property name="generalComponentSchema" value="http://www.clarin.eu/cmd/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 https://www.clarin.eu/cmd/general-component-schema.xsd" />
+<!--    <property name="generalComponentSchema" value="https://www.clarin.eu/cmd/general-component-schema.xsd" />-->
+<!--    Schema on LUX16 contains Schematron rules, not yet in production... -->
+        <property name="generalComponentSchema" value="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="componentSpecSchemaLocation" value="http://www.clarin.eu/cmd http://lux16.mpi.nl/general-component-schema.xsd" />
 
         <property name="component2SchemaXsl" value="https://www.clarin.eu/cmd/xslt/comp2schema-v2/comp2schema.xsl"/>