Changeset 2668

Timestamp:

03/08/13 16:37:08 (11 years ago)

Author:

keeloo

Message:

Cleaned up packaging. Ready to start tests on server

Location:

vlo/branches/vlo-2.13-param

Files:

• src/main/assembly/installPackageBuilder.xml (modified) (2 diffs)
• vlo_importer/src/main/bin/vlo_solr_importer.sh (modified) (2 diffs)
• vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) (2 diffs)
• vlo_importer/xsdMapping.txt (modified) (1 diff)
• vlo_web_app/pom.xml (modified) (4 diffs)
• vlo_web_app/src/main/resources (deleted)

vlo/branches/vlo-2.13-param/src/main/assembly/installPackageBuilder.xml

@@ -87 +87 @@
             <outputDirectory>bin</outputDirectory>
         </fileSet>
-<!-- VLO WAR FILE -->
+<!-- WEB APPLICATION -->
         <!-- WAR FILE -->
         <fileSet>
@@ -103 +103 @@
             </includes>
             <outputDirectory>config</outputDirectory>
-        </fileSet>
+        </fileSet> 
 
-<!-- SOLR -->
+<!-- SOLR SERVER -->
         <!-- SOLR WAR FILE -->
         <fileSet>

vlo/branches/vlo-2.13-param/vlo_importer/src/main/bin/vlo_solr_importer.sh

@@ -1 +1 @@
 #!/bin/sh
 
-# This means it the script only works started from the bin directory,
-# adjust the workdir if you installed this somewhere and want to run it from anywhere.
+# This means it the script only works started from the bin directory, adjust the
+# workdir if you installed this somewhere and want to run it from anywhere.
 
-# Filter of the Error stream from which to prevent the admins from getting daily "can't find java" emails
+# Filter of the Error stream from which to prevent the admins from getting daily
+#  "can't find java" emails
 JAVA=`which java 2>/dev/null`
 if [  -z $JAVA ]; then
@@ -11 +12 @@
 fi
 
+# Please specify the configuration to the importer via a system property or via
+# the command line. In case of a property add 
+#
+# -DconfigFile=<pathToConfigFile>
+#
+# and in case of the command line, add
+#
+# -c <pathToConfigFile>
+#
+# to the JAVA command. Please note the a specification on the command line will
+# take preference over a specification as a property.
 
-$JAVA -Xmx1024M -cp .:vlo-2.13-jar.jar eu.clarin.cmdi.vlo.importer.MetadataImporter
+$JAVA -Xmx1024M -cp .:vlo-2.13-importer.jar eu.clarin.cmdi.vlo.importer.MetadataImporter 

vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java

@@ -374 +374 @@
      * @throws IOException
      */
-    public static void main(String[] args) throws MalformedURLException, IOException {
+    public static void main(String[] args) throws MalformedURLException, IOException { 
 
         // application configuration
         VloConfig config;
+        
+        // path to the configuration file
+        String configFile = null;
         
         // use the Apache cli framework for getting command line parameters
@@ -396 +399 @@
                 
                 // the "c" option was specified, now get its value
-                String fileName;
-                fileName = cmd.getOptionValue("c");
-                
-                // optionally, check for file existence here
-                
-                // read the configuration from the externally supplied file
-                VloConfig.readConfig(fileName);
-
-                // optionally, modify the configuration here
-                
-                // create and start the importer
-                MetadataImporter importer = new MetadataImporter();
-                importer.startImport();
-                
-                // finished importing
-                
-                if (VloConfig.printMapping()) {
-                    File file = new File("xsdMapping.txt");
-                    FacetMappingFactory.printMapping(file);
-                    LOG.info("Printed facetMapping in " + file);
-                }
+                configFile = cmd.getOptionValue("c");
             }
 
         } catch (org.apache.commons.cli.ParseException ex) {
             
-            // caught an exception caused by command line parsing
-            
+            /**
+             * Caught an exception caused by command line parsing. Try to get
+             * the name of the configuration file by querying the system
+             * property.
+             */
+
             String message = "Command line parsing failed. " + ex.getMessage();
-                   
             LOG.error(message);
             System.err.println(message);
+            
+            String key;
+            key = "configFile";
+            configFile = System.getProperty(key);
+        }
+            
+        if (configFile == null) {
+            
+            String message;
+            
+            message = "Could not get filename as system property either.";
+            LOG.error(message);
+            System.err.println(message);
+        } else {
+            // read the configuration from the externally supplied file
+            VloConfig.readConfig(configFile);
+
+            // optionally, modify the configuration here
+
+            // create and start the importer
+            MetadataImporter importer = new MetadataImporter();
+            importer.startImport();
+
+            // finished importing
+
+            if (VloConfig.printMapping()) {
+                File file = new File("xsdMapping.txt");
+                FacetMappingFactory.printMapping(file);
+                LOG.info("Printed facetMapping in " + file);
+            }
         }
     }

vlo/branches/vlo-2.13-param/vlo_importer/xsdMapping.txt

@@ -1 @@
-This file is generated on Mar 8, 2013 10:12:39 AM and only used to document the mapping.
+This file is generated on Mar 8, 2013 1:59:24 PM and only used to document the mapping.
 This file contains xsd name and a list of conceptName with xpath mappings that are generated.
 ---------------------
+http://www.openarchives.org/OAI/2.0/oai_dc.xsd
+FacetName:id
+Mappings:
+    /c:CMD/c:Header/c:MdSelfLink/text()
+FacetName:collection
+Mappings:
+    /c:CMD/c:Header/c:MdCollectionDisplayName/text()
+FacetName:name
+Mappings:
+    /c:CMD/c:Components/c:LrtInventoryResource/c:LrtCommon/c:ResourceName/text()
+FacetName:country
+Mappings:
+    /c:CMD/c:Components/c:OLAC-DcmiTerms/c:spatial[@dcterms-type="ISO3166"]/text()
+    /c:CMD/c:Components/c:OLAC-DcmiTerms/c:coverage[@dcterms-type="ISO3166"]/text()
+FacetName:language
+Mappings:
+    /c:CMD/c:Components/c:OLAC-DcmiTerms/c:language/@olac-language
+    /c:CMD/c:Components/c:OLAC-DcmiTerms/c:subject/@olac-language
+    /c:CMD/c:Components/c:LrtInventoryResource/c:LrtCommon/c:Languages/c:ISO639/c:iso-639-3-code/text()
+FacetName:languages
+Mappings:
+    /c:CMD/c:Components/c:OLAC-DcmiTerms/c:language/@olac-language
+    /c:CMD/c:Components/c:OLAC-DcmiTerms/c:subject/@olac-language
+    /c:CMD/c:Components/c:LrtInventoryResource/c:LrtCommon/c:Languages/c:ISO639/c:iso-639-3-code/text()
+FacetName:genre
+Mappings:
+    /c:CMD/c:Components/c:OLAC-DcmiTerms/c:type/@olac-linguistic-type
+FacetName:subject
+Mappings:
+    /c:CMD/c:Components/c:OLAC-DcmiTerms/c:subject/@olac-linguistic-field
+    /c:CMD/c:Components/c:OLAC-DcmiTerms/c:subject[@dcterms-type="LCSH"]/text()
+FacetName:resourceType
+Mappings:
+    /c:CMD/c:Components/c:LrtInventoryResource/c:LrtCommon/c:ResourceType/text()
+    /c:CMD/c:Components/c:OLAC-DcmiTerms/c:type/text()
+FacetName:nationalProject
+Mappings:
+    /c:CMD/c:Header/c:MdCollectionDisplayName/text()
+FacetName:text
+Mappings:
+    /c:CMD//text()
+FacetName:_componentProfile
+Mappings:
+    /c:CMD/c:Header/c:MdProfile/text()
+---------------------

vlo/branches/vlo-2.13-param/vlo_web_app/pom.xml

@@ -73 +73 @@
                 </configuration>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -81 +82 @@
                 </configuration>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -106 +108 @@
                 </executions>
             </plugin>
+            
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -124 +127 @@
                 </executions>
             </plugin>
-            
         </plugins>
+        
     </build>
-
 </project>