M cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIVali…

…datorConfig.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
clarin-eric · Jul 8, 2016 · 7d91608 · 7d91608
1 parent f4758c6
commit 7d91608
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 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
@@ -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
@@ -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
@@ -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>
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         public CMDISchemaLoader(File cacheDirectory, long maxCacheAge) {
-            this(cacheDirectory, maxCacheAge, TimeUnit.HOURS.toMillis(1), 10000, 25000);
+            this(cacheDirectory, maxCacheAge, TimeUnit.HOURS.toMillis(1), 60000, 60000);
         }
@@ Expand Down @@