Changeset 1854
- Timestamp:
- 04/04/12 10:09:30 (12 years ago)
- Location:
- vlo/trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
vlo/trunk/pom.xml
r1831 r1854 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 3 xsi:schemaLocation="http://maven.apache.org/POM/4.0.03 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 4 4 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 5 <modelVersion>4.0.0</modelVersion>6 <groupId>eu.clarin.cmdi</groupId>7 <artifactId>vlo_parent</artifactId>8 <name>Virtual Language Observatory (parent pom)</name>9 <packaging>pom</packaging>10 <version>2.6</version>11 <description>Parent pom for the whole vlo project (in order to be able to do fancy packaging.</description>5 <modelVersion>4.0.0</modelVersion> 6 <groupId>eu.clarin.cmdi</groupId> 7 <artifactId>vlo_parent</artifactId> 8 <name>Virtual Language Observatory (parent pom)</name> 9 <packaging>pom</packaging> 10 <version>2.6</version> 11 <description>Parent pom for the whole vlo project (in order to be able to do fancy packaging.</description> 12 12 13 <parent>14 <groupId>nl.mpi</groupId>15 <artifactId>parent</artifactId>16 <version>1.2</version>17 </parent>13 <parent> 14 <groupId>nl.mpi</groupId> 15 <artifactId>parent</artifactId> 16 <version>1.2</version> 17 </parent> 18 18 19 <modules>20 21 22 </modules>19 <modules> 20 <module>vlo_solr</module> 21 <module>vlo_webapp</module> 22 </modules> 23 23 24 <properties> 25 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 26 </properties> 24 <properties> 25 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 26 </properties> 27 28 <build> 29 <plugins> 30 <plugin> 31 <artifactId>maven-assembly-plugin</artifactId> 32 <version>2.3</version> 33 <configuration> 34 <descriptors> 35 <descriptor>src/main/assembly/installPackageBuilder.xml</descriptor> 36 </descriptors> 37 </configuration> 38 <executions> 39 <execution> 40 <id>make-assembly</id> <!-- this is used for inheritance merges --> 41 <phase>package</phase> <!-- bind to the packaging phase --> 42 <goals> 43 <goal>single</goal> 44 </goals> 45 </execution> 46 </executions> 47 </plugin> 48 </plugins> 49 </build> 27 50 </project> 28 51 -
vlo/trunk/src/main/assembly/installPackageBuilder.xml
r1851 r1854 19 19 </formats> 20 20 <includeBaseDirectory>false</includeBaseDirectory> 21 <dependencySets>22 <!-- IMPORTER: Dependencies -->23 <dependencySet>24 <useDefaultExcludes/>25 <outputDirectory>bin/importer/lib</outputDirectory>26 </dependencySet>27 </dependencySets>28 21 <fileSets> 29 22 <!-- DOCS --> 30 23 <fileSet> 31 <directory>../docs</directory> 32 <includes>*.*</includes> 33 <outputDirectory>/doc</outputDirectory> 24 <directory>docs</directory> 25 <includes> 26 <include>*.*</include> 27 </includes> 28 <outputDirectory>doc</outputDirectory> 34 29 </fileSet> 35 30 <fileSet> 36 <directory>.</directory> 37 <includes>CHANGES</includes> 38 <includes>DEPLOY-README</includes> 39 <outputDirectory>/doc</outputDirectory> 31 <directory>vlo_webapp</directory> 32 <includes> 33 <include>CHANGES</include> 34 <include>DEPLOY-README</include> 35 </includes> 36 <outputDirectory>doc</outputDirectory> 40 37 </fileSet> 41 38 <fileSet> 42 <directory>../vlo_solr</directory> 43 <includes>README.TXT</includes> 44 <outputDirectory>/doc/vlosolr</outputDirectory> 39 <directory>vlo_solr</directory> 40 <includes> 41 <include>README.TXT</include> 42 </includes> 43 <outputDirectory>doc/vlosolr</outputDirectory> 45 44 </fileSet> 46 <!-- IMPORTER --> 47 <!-- run script --> 48 <fileSet> 49 <directory>src/main/bin</directory> 50 <includes> 51 <include>*.sh</include> 52 <fileMode>0755</fileMode> 53 </includes> 54 <outputDirectory>bin/importer/bin</outputDirectory> 55 </fileSet> 56 <!-- config files --> 57 <fileSet> 58 <directory>src/main/bin</directory> 59 <includes> 60 <include>log4j.properties</include> 61 </includes> 62 <outputDirectory>bin/importer/bin</outputDirectory> 63 </fileSet> 64 <fileSet> 65 <directory>src/main/resources</directory> 66 <includes> 67 <include>*.xml</include> 68 </includes> 69 <outputDirectory>bin/importer/bin</outputDirectory> 70 </fileSet> 71 <fileSet> 72 <directory>src/main/resources</directory> 73 <includes> 74 <include>*.xml</include> 75 </includes> 76 <outputDirectory>bin/importer/bin</outputDirectory> 77 </fileSet> 78 <!-- OVERWRITE applicationcontext.xml with the test version. 79 The normal (VLO_webapp) version contains a context parameter. 80 The importer does not have context parameters, being run from the commandline --> 81 <fileSet> 82 <directory>src/test/resources</directory> 83 <includes> 84 <include>applicationContext.xml</include> 85 </includes> 86 <outputDirectory>bin/importer/bin</outputDirectory> 87 </fileSet> 88 <!-- VLO WAR FILE --> 89 <!-- WAR FILE --> 90 <fileSet> 91 <directory>target</directory> 92 <includes> 93 <include>*.war</include> 94 </includes> 95 <outputDirectory>war/vlo</outputDirectory> 96 </fileSet> 97 <!-- config --> 98 <fileSet> 99 <directory></directory> 100 </fileSet> 45 <!-- IMPORTER --> 46 <!-- Jar File --> 47 <fileSet> 48 <directory>vlo_webapp/target</directory> 49 <includes> 50 <include>*jar-with-dependencies.jar</include> 51 </includes> 52 <outputDirectory>bin/importer</outputDirectory> 53 </fileSet> 54 <!-- run script --> 55 <fileSet> 56 <directory>vlo_webapp/src/main/bin</directory> 57 <includes> 58 <include>*.sh</include> 59 </includes> 60 <fileMode>0755</fileMode> 61 <outputDirectory>bin/importer</outputDirectory> 62 </fileSet> 63 <!-- config files --> 64 <fileSet> 65 <directory>vlo_webapp/src/main/bin</directory> 66 <includes> 67 <include>*.properties</include> 68 </includes> 69 <outputDirectory>bin/importer</outputDirectory> 70 </fileSet> 71 <fileSet><!-- TODO: Make NOT NEEDED, need properties instead! --> 72 <directory>vlo_webapp/src/main/resources</directory> 73 <includes> 74 <include>importerConfig.xml</include> 75 <include>application.properties</include> 76 </includes> 77 <outputDirectory>bin/importer</outputDirectory> 78 </fileSet> 79 <!-- VLO WAR FILE --> 80 <!-- WAR FILE --> 81 <fileSet> 82 <directory>vlo_webapp/target</directory> 83 <includes> 84 <include>*.war</include> 85 </includes> 86 <outputDirectory>war/vlo</outputDirectory> 87 </fileSet> 88 <!-- config --> 89 <fileSet> 90 <directory>vlo_webapp/src/main/resources</directory> 91 <includes> 92 <include>contextfragment.xml</include> 93 </includes> 94 <outputDirectory>config/vlo</outputDirectory> 95 </fileSet> 101 96 102 <!-- SOLR --> 103 <!-- SOLR WAR FILE --> 97 <!-- SOLR --> 98 <!-- SOLR WAR FILE --> 99 <fileSet> 100 <directory>vlo_solr/target</directory> 101 <includes> 102 <include>*.war</include> 103 </includes> 104 <outputDirectory>war/solr</outputDirectory> 105 </fileSet> 104 106 105 <!-- SOLR CONFIG --> 107 <!-- SOLR CONFIG --> 108 <fileSet> 109 <directory>vlo_solr/target/vlo_solr-1.4.2-vlo_solr_conf</directory> 110 <includes> 111 <include>solr</include> 112 </includes> 113 <outputDirectory>config/solr/solrconfig</outputDirectory> 114 </fileSet> 115 <fileSet> 116 <directory>vlo_solr/target/vlo_solr-1.4.2-vlo_solr_conf</directory> 117 <includes> 118 <include>vlo_solr.xml</include> 119 </includes> 120 <outputDirectory>config/solr</outputDirectory> 121 </fileSet> 106 122 </fileSets> 107 108 123 </assembly> -
vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/Configuration.java
r1414 r1854 6 6 /** 7 7 * see applicationContext.xml resource for proper values. 8 * 8 * 9 9 **/ 10 10 public final class Configuration { … … 15 15 private final static String PROFILE_ID_PLACEHOLDER = "{PROFILE_ID}"; 16 16 private String solrUrl; 17 18 public String getImporterConfigFile() { 19 return importerConfigFile; 20 } 21 22 public void setImporterConfigFile(String importerConfigFile) { 23 this.importerConfigFile = importerConfigFile; 24 } 25 26 private String importerConfigFile; 17 27 18 28 private String imdiBrowserUrl;// = "http://corpus1.mpi.nl/ds/imdi_browser?openpath="; … … 126 136 this.profileSchemaUrl = profileSchemaUrl; 127 137 } 128 138 129 139 130 140 } -
vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java
r1806 r1854 67 67 long start = System.currentTimeMillis(); 68 68 try { 69 69 // Delete the whole Solr db 70 70 if (config.isDeleteAllFirst()) { 71 71 LOG.info("Deleting original data..."); … … 139 139 result.add(rootFile); 140 140 } else { 141 141 Collection<File> listFiles = FileUtils.listFiles(rootFile, VALID_CMDI_EXTENSIONS, true); 142 142 result.addAll(listFiles); 143 143 } … … 292 292 */ 293 293 public static void main(String[] args) throws IOException { 294 BeanFactory factory = new ClassPathXmlApplicationContext(new String[] { Configuration.CONFIG_FILE , ImporterConfig.CONFIG_FILE});294 BeanFactory factory = new ClassPathXmlApplicationContext(new String[] { Configuration.CONFIG_FILE }); 295 295 factory.getBean("configuration"); 296 ImporterConfig config = (ImporterConfig) factory.getBean("importerConfig", ImporterConfig.class); 297 Configuration test = Configuration.getInstance(); 298 System.out.println(test.getSolrUrl()); 299 300 //MetadataImporter importer = new MetadataImporter(config); 301 /* importer.startImport(); 296 Configuration cfg = Configuration.getInstance(); 297 298 BeanFactory factory2 = new ClassPathXmlApplicationContext(new String[] { cfg.getImporterConfigFile() } ); 299 300 ImporterConfig config = (ImporterConfig) factory2.getBean("importerConfig", ImporterConfig.class); 301 302 MetadataImporter importer = new MetadataImporter(config); 303 importer.startImport(); 302 304 if (config.isPrintMapping()) { 303 305 File file = new File("xsdMapping.txt"); 304 306 FacetMappingFactory.printMapping(file); 305 307 LOG.info("Printed facetMapping in " + file); 306 } */308 } 307 309 } 308 310 -
vlo/trunk/vlo_webapp/src/main/resources/application.properties
r1853 r1854 1 1 #Application properties; specifically the solrUrl to use! 2 2 eu.clarin.cmdi.vlo.solrUrl=http://localhost:8080/vlo_solr 3 eu.clarin.cmdi.vlo.importerConfigFile=importerConfig.xml -
vlo/trunk/vlo_webapp/src/main/resources/applicationContext.xml
r1853 r1854 16 16 <!-- <property name="solrUrl" value="http://lux16.mpi.nl:8080/vlo_solr" />--> 17 17 <!-- <property name="solrUrl" value="http://catalog.clarin.eu:8080/vlo_solr" />--> 18 <property name="importerConfigFile" value="${eu.clarin.cmdi.vlo.importerConfigFile}" /> 19 18 20 <property name="IMDIBrowserUrl" value="http://corpus1.mpi.nl/ds/imdi_browser?openpath=" /> 19 21 <property name="handleServerUrl" value="http://hdl.handle.net/" /> -
vlo/trunk/vlo_webapp/src/main/resources/contextfragment.xml
r1805 r1854 1 1 <Context path="/ds/vlo" docBase="/lat/webapps/vlo/current" debug="0" privileged="true"> 2 2 <Parameter name="eu.clarin.cmdi.vlo.solrUrl" value="http://localhost/ds/vlosolr" override="false"/> 3 <Parameter name="eu.clarin.cmdi.vlo.importerConfigFile" value="/PATH/TO/IMPORTERCONFIG!"/> 3 4 </Context> 4 5
Note: See TracChangeset
for help on using the changeset viewer.