Changeset 2658

Timestamp:

03/06/13 15:38:13 (11 years ago)

Author:

keeloo

Message:

Repaired the packaging. Still need to check the contents of the new
package, compare it with the old one, and test both the web
application and the importer by installing them outside the Netbeans
environment.

Location:

vlo/branches/vlo-2.13-param/vlo_web_app

Files:

• pom.xml (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/vlo/VloApplication.java (modified) (1 diff)
• src/main/resources/VloConfig.xml (modified) (2 diffs)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+    
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
-    <artifactId>vlo_parent</artifactId>
-    <groupId>eu.clarin.cmdi</groupId>
-    <version>2.13</version>
-  </parent>
+        <artifactId>vlo_parent</artifactId>
+        <groupId>eu.clarin.cmdi</groupId>
+        <version>2.13</version>
+    </parent>
 
     <groupId>mpi</groupId>
+    
     <artifactId>vlo_web_app</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    
+    <version>2.13</version>
+    
     <packaging>war</packaging>
 
@@ -47 +55 @@
                 <directory>src/main/java</directory>
                 <excludes>
-                    <exclude>**/*.java</exclude>
+                    <exclude>**/*.java</exclude> <!-- java not needed in the source -->
                 </excludes>
             </resource>

vlo/branches/vlo-2.13-param/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloApplication.java

@@ -71 +71 @@
         String fileName = VloConfig.class.getResource("/VloConfig.xml").getFile();
         
+        // configSource = getClass().getClassLoader().getResourceAsStream(fileName);
+        
         config = VloConfig.readConfig(fileName);
 

vlo/branches/vlo-2.13-param/vlo_web_app/src/main/resources/VloConfig.xml

@@ -1 @@
-<webAppConfig>
+<VloConfig>
    
     <deleteAllFirst>false</deleteAllFirst>
@@ -68 +68 @@
     
     <FederatedContentSearchUrl>http://weblicht.sfs.uni-tuebingen.de/Aggregator/</FederatedContentSearchUrl>
-</webAppConfig>
+</VloConfig>