From 7d91608c9d665ee82fb663b51af3a72fb97c0281 Mon Sep 17 00:00:00 2001
From: Menzo Windhouwer <menzo.windhouwer@meertens.knaw.nl>
Date: Fri, 8 Jul 2016 11:35:20 +0000
Subject: [PATCH] M   
 cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorConfig.java
 M   
 cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDISchemaLoader.java
 - increased timeouts

M    cmdi-validator-core/src/main/resources/default.sch
- check that the XSD comes from the catalog
---
 .../java/eu/clarin/cmdi/validator/CMDISchemaLoader.java     | 2 +-
 .../java/eu/clarin/cmdi/validator/CMDIValidatorConfig.java  | 4 ++--
 cmdi-validator-core/src/main/resources/default.sch          | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDISchemaLoader.java b/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDISchemaLoader.java
index 11554f3..25c7f93 100644
--- a/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDISchemaLoader.java
+++ b/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDISchemaLoader.java
@@ -93,7 +93,7 @@ public CMDISchemaLoader(File cacheDirectory, long maxCacheAge, int connectTimeou
     }
 
     public CMDISchemaLoader(File cacheDirectory, long maxCacheAge) {
-        this(cacheDirectory, maxCacheAge, TimeUnit.HOURS.toMillis(1), 10000, 25000);
+        this(cacheDirectory, maxCacheAge, TimeUnit.HOURS.toMillis(1), 60000, 60000);
     }
 
 
diff --git a/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorConfig.java b/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorConfig.java
index 193599e..0dfa9d4 100644
--- a/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorConfig.java
+++ b/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorConfig.java
@@ -32,8 +32,8 @@ public class CMDIValidatorConfig {
     private File schematronSchemaFile = null;
     private boolean schematronDisabled = false;
     private List<CMDIValidatorExtension> extensions = null;
-    private int connectTimeout = 10000;
-    private int socketTimeout = 25000;
+    private int connectTimeout = 60000;
+    private int socketTimeout = 60000;
 
 
     private CMDIValidatorConfig(final File root,
diff --git a/cmdi-validator-core/src/main/resources/default.sch b/cmdi-validator-core/src/main/resources/default.sch
index b98aa49..ccb5b74 100644
--- a/cmdi-validator-core/src/main/resources/default.sch
+++ b/cmdi-validator-core/src/main/resources/default.sch
@@ -41,15 +41,15 @@
     <pattern>
         <title>Test xsi:schemaLocation</title>
         <rule role="warning" context="/cmd11:CMD">
-            <assert test="contains(@xsi:schemaLocation,'http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/profiles/')">
-                [CMDI Best Practice] /cmd:CMD/@xsi:schemaLocation doesn't refer to a schema from the Component Registry! [Actual value was [<value-of select="@xsi:schemaLocation"/>]
+            <assert test="matches(@xsi:schemaLocation,'http(s)?://catalog.clarin.eu/ds/ComponentRegistry/rest/')">
+                [CMDI Best Practice] /cmd:CMD/@xsi:schemaLocation doesn't refer to a schema from the Component Registry! Actual value was [<value-of select="@xsi:schemaLocation"/>]
             </assert>
         </rule>
     </pattern>
     <pattern>
         <title>Test xsi:schemaLocation</title>
         <rule role="warning" context="/cmd12:CMD">
-            <assert test="contains(@xsi:schemaLocation,'http://alpha-vlo.clarin.eu/component-registry-rest/rest/registry/1.x/profiles/')">
+            <assert test="matches(@xsi:schemaLocation,'http(s)?://catalog.clarin.eu/ds/ComponentRegistry/rest/')">
                 [CMDI Best Practice] /cmd:CMD/@xsi:schemaLocation doesn't refer to a schema from the Component Registry! [Actual value was [<value-of select="@xsi:schemaLocation"/>]
             </assert>
         </rule>