Changeset 1886


Ignore:
Timestamp:
04/17/12 08:15:15 (12 years ago)
Author:
herste
Message:

Made location of NationalProjectsMapping?.xml configurable and externalized the xml file also: only relevant for the importer. Should allow updating of mapping _without_ a new deployment.

Location:
vlo/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • vlo/trunk/src/main/assembly/installPackageBuilder.xml

    r1855 r1886  
    8282                <include>importerConfig.xml</include>
    8383                <include>application.properties</include>
     84                <include>nationalProjectsMapping.xml</include>
    8485            </includes>
    8586            <outputDirectory>bin/importer</outputDirectory>

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/Configuration.java

    r1854 r1886  
    2525
    2626    private String importerConfigFile;
     27
     28    public String getNationalProjectMapping() {
     29        return nationalProjectMapping;
     30    }
     31
     32    public void setNationalProjectMapping(String nationalProjectMapping) {
     33        this.nationalProjectMapping = nationalProjectMapping;
     34    }
     35
     36    private String nationalProjectMapping;
    2737
    2838    private String imdiBrowserUrl;// = "http://corpus1.mpi.nl/ds/imdi_browser?openpath=";

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/importer/NationalProjectPostProcessor.java

    r1763 r1886  
    1212import javax.xml.xpath.XPathFactory;
    1313
     14import eu.clarin.cmdi.vlo.Configuration;
    1415import org.apache.commons.io.FileUtils;
    1516import org.slf4j.Logger;
    … …  
    2526public class NationalProjectPostProcessor extends LanguageCodePostProcessor {
    2627        private final static Logger LOG = LoggerFactory.getLogger(NationalProjectPostProcessor.class);
    27        
    28         private static String mappingFileName = "nationalProjectsMapping.xml";
     28
     29        //private static String mappingFileName = "nationalProjectsMapping.xml";
    2930        private static Map<String, String> nationalProjectMap = null;
    30        
     31
    3132        /**
    3233         * Returns the national project based on the mapping in Configuration.getNationalProjectMapUrl()
    3334         * If no mapping was found empty String is returned
    34          * @return 
     35         * @return
    3536         */
    3637        @Override
    … …  
    4445        return result;
    4546    }
    46        
     47
    4748        private Map<String, String> getMapping() {
    4849                if(nationalProjectMap == null)
    … …  
    5051                return  nationalProjectMap;
    5152        }
    52        
     53
    5354        private Map<String, String> getNationalProjectMapping() {
     55        String mappingFileName = Configuration.getInstance().getNationalProjectMapping();
    5456                LOG.debug("Creating national project map.");
    5557        try {
    … …  
    7779        }
    7880        }
    79        
     81
    8082        /**
    8183         * Create temporary and minimal mapping file for testing purposes and as backup solution
    … …  
    8890        content += "   <nationalProjectMapping><MdCollectionDisplayName>ANDES</MdCollectionDisplayName><NationalProject>CLARIN-EU</NationalProject></nationalProjectMapping>\n";
    8991        content += "</nationalProjects>\n";
    90        
     92
    9193        File file = null;
    9294        try {
    … …  
    9799                LOG.error("Could not create temporary national project mapping file");
    98100        }
    99        
     101
    100102        return file;
    101103        }

  • vlo/trunk/vlo_webapp/src/main/resources/application.properties

    r1854 r1886  
    22eu.clarin.cmdi.vlo.solrUrl=http://localhost:8080/vlo_solr
    33eu.clarin.cmdi.vlo.importerConfigFile=importerConfig.xml
     4eu.clarin.cmdi.vlo.nationalProjectMapping=nationalProjectsMapping.xml

  • vlo/trunk/vlo_webapp/src/main/resources/applicationContext.xml

    r1854 r1886  
    1717        <!--    <property name="solrUrl" value="http://catalog.clarin.eu:8080/vlo_solr" />-->
    1818        <property name="importerConfigFile" value="${eu.clarin.cmdi.vlo.importerConfigFile}" />
     19
     20        <property name="nationalProjectMapping" value="${eu.clarin.cmdi.vlo.nationalProjectMapping}" />
    1921
    2022        <property name="IMDIBrowserUrl" value="http://corpus1.mpi.nl/ds/imdi_browser?openpath=" />

  • vlo/trunk/vlo_webapp/src/main/resources/contextfragment.xml

    r1854 r1886  
    22    <Parameter name="eu.clarin.cmdi.vlo.solrUrl" value="http://localhost/ds/vlosolr" override="false"/>
    33    <Parameter name="eu.clarin.cmdi.vlo.importerConfigFile" value="/PATH/TO/IMPORTERCONFIG!"/>
     4    <Parameter name="eu.clarin.cmdi.vlo.nationalProjectMapping" value="/PATH/TO/DOESN'T MATTER!"/>
    45</Context>
    56

  • vlo/trunk/vlo_webapp/src/test/resources/application.properties

    r1855 r1886  
    22eu.clarin.cmdi.vlo.solrUrl=http://localhost:8080/vlo_solr
    33eu.clarin.cmdi.vlo.importerConfigFile=importerConfig.xml
     4eu.clarin.cmdi.vlo.nationalProjectMapping=nationalProjectsMapping.xml

  • vlo/trunk/vlo_webapp/src/test/resources/applicationContext.xml

    r1855 r1886  
    1717        <!--    <property name="solrUrl" value="http://catalog.clarin.eu:8080/vlo_solr" />-->
    1818        <property name="importerConfigFile" value="${eu.clarin.cmdi.vlo.importerConfigFile}" />
     19        <property name="nationalProjectMapping" value="${eu.clarin.cmdi.vlo.nationalProjectMapping}" />
     20
    1921
    2022        <property name="IMDIBrowserUrl" value="http://corpus1.mpi.nl/ds/imdi_browser?openpath=" />
Note: See TracChangeset for help on using the changeset viewer.