Changeset 7038 for CMDIValidator


Ignore:
Timestamp:
07/08/16 11:35:20 (8 years ago)
Author:
Menzo Windhouwer
Message:

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
Location:
CMDIValidator/tags/1.0.0/cmdi-validator-core/src/main
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • CMDIValidator/tags/1.0.0/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDISchemaLoader.java

    r7031 r7038  
    9494
    9595    public CMDISchemaLoader(File cacheDirectory, long maxCacheAge) {
    96         this(cacheDirectory, maxCacheAge, TimeUnit.HOURS.toMillis(1), 10000, 25000);
     96        this(cacheDirectory, maxCacheAge, TimeUnit.HOURS.toMillis(1), 60000, 60000);
    9797    }
    9898

  • CMDIValidator/tags/1.0.0/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorConfig.java

    r7031 r7038  
    3333    private boolean schematronDisabled = false;
    3434    private List<CMDIValidatorExtension> extensions = null;
    35     private int connectTimeout = 10000;
    36     private int socketTimeout = 25000;
     35    private int connectTimeout = 60000;
     36    private int socketTimeout = 60000;
    3737
    3838

  • CMDIValidator/tags/1.0.0/cmdi-validator-core/src/main/resources/default.sch

    r7018 r7038  
    4242        <title>Test xsi:schemaLocation</title>
    4343        <rule role="warning" context="/cmd11:CMD">
    44             <assert test="contains(@xsi:schemaLocation,'http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/profiles/')">
    45                 [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"/>]
     44            <assert test="matches(@xsi:schemaLocation,'http(s)?://catalog.clarin.eu/ds/ComponentRegistry/rest/')">
     45                [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"/>]
    4646            </assert>
    4747        </rule>
    … …  
    5050        <title>Test xsi:schemaLocation</title>
    5151        <rule role="warning" context="/cmd12:CMD">
    52             <assert test="contains(@xsi:schemaLocation,'http://alpha-vlo.clarin.eu/component-registry-rest/rest/registry/1.x/profiles/')">
     52            <assert test="matches(@xsi:schemaLocation,'http(s)?://catalog.clarin.eu/ds/ComponentRegistry/rest/')">
    5353                [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"/>]
    5454            </assert>
Note: See TracChangeset for help on using the changeset viewer.