Changeset 6793


Ignore:
Timestamp:
11/11/15 09:59:32 (9 years ago)
Author:
davor.ostojic@oeaw.ac.at
Message:

maps will be read from classpath (vlo-vocabs), importer and tests are adopted for this

Location:
vlo/branches/vlo-3.3-oeaw/vlo-importer/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/PostProcessorsWithVocabularyMap.java

    r6773 r6793  
    6666                        // file only used as fallback
    6767                       
    68                        
    69                         //try from file first
    70                         try {
    71                                 InputStream is = new FileInputStream(new File(mapUrl));
    72                         } catch (Exception e) {
    73                                 _logger.warn("File {} not found, trying to fetch it from classpath ...", mapUrl);
    74                                
    75                                
    76                         }
    77                        
    78                         //try from classpath
    79                        
    8068                        InputStream is = PostProcessorsWithVocabularyMap.class.getClassLoader().getResourceAsStream(mapUrl);
    8169                        if(is == null)

  • vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java

    r6778 r6793  
    2727public abstract class ImporterTestcase {
    2828
    29         private final String VOC_MAPS_PATH = "";
    3029    private final VloConfigFactory configFactory = new DefaultVloConfigFactory();
    3130    protected VloConfig config;
    … …  
    5655        MetadataImporter.config.setComponentRegistryRESTURL("http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/profiles/");
    5756        //point to transformed maps
    58         MetadataImporter.config.setLicenseAvailabilityMapUrl(VOC_MAPS_PATH + MetadataImporter.config.getLicenseAvailabilityMapUrl().substring(1));
    59         MetadataImporter.config.setLanguageNameVariantsUrl(VOC_MAPS_PATH + MetadataImporter.config.getLanguageNameVariantsUrl().substring(1));
    60         MetadataImporter. config.setNationalProjectMapping(VOC_MAPS_PATH + MetadataImporter.config.getNationalProjectMapping().substring(1));
    61         MetadataImporter.config.setOrganisationNamesUrl(VOC_MAPS_PATH + MetadataImporter.config.getOrganisationNamesUrl().substring(1));
    62         MetadataImporter.config.setResourceClassMapUrl(VOC_MAPS_PATH + MetadataImporter.config.getResourceClassMapUrl().substring(1));
     57        MetadataImporter.config.setLicenseAvailabilityMapUrl(MetadataImporter.config.getLicenseAvailabilityMapUrl());
     58        MetadataImporter.config.setLanguageNameVariantsUrl(MetadataImporter.config.getLanguageNameVariantsUrl());
     59        MetadataImporter. config.setNationalProjectMapping(MetadataImporter.config.getNationalProjectMapping());
     60        MetadataImporter.config.setOrganisationNamesUrl(MetadataImporter.config.getOrganisationNamesUrl());
     61        MetadataImporter.config.setResourceClassMapUrl(MetadataImporter.config.getResourceClassMapUrl());
    6362       
    6463        config = MetadataImporter.config;
Note: See TracChangeset for help on using the changeset viewer.