Changeset 1855

Timestamp:

04/04/12 13:41:03 (12 years ago)

Author:

herste

Message:

bla

Location:

vlo/trunk

Files:

• src/main/assembly/installPackageBuilder.xml (modified) (2 diffs)
• vlo_webapp/pom.xml (modified) (4 diffs)
• vlo_webapp/src/main/assembly (deleted)
• vlo_webapp/src/test/resources/application.properties (copied) (copied from vlo/trunk/vlo_webapp/src/main/resources/application.properties)
• vlo_webapp/src/test/resources/applicationContext.xml (copied) (copied from vlo/trunk/vlo_webapp/src/test/resources/applicationContext.xml) (1 diff)

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

@@ -48 +48 @@
             <directory>vlo_webapp/target</directory>
             <includes>
-                <include>*jar-with-dependencies.jar</include>
+                <include>*.jar</include>
             </includes>
             <outputDirectory>bin/importer</outputDirectory>
+        </fileSet>
+        <!-- Dependencies -->
+        <fileSet>
+            <directory>vlo_webapp/target/lib</directory>
+            <includes>
+                <include>*.*</include>
+            </includes>
+            <outputDirectory>bin/importer/lib</outputDirectory>
         </fileSet>
         <!-- run script -->
@@ -69 +77 @@
             <outputDirectory>bin/importer</outputDirectory>
         </fileSet>
-        <fileSet><!-- TODO: Make NOT NEEDED, need properties instead! -->
+        <fileSet>
             <directory>vlo_webapp/src/main/resources</directory>
             <includes>

vlo/trunk/vlo_webapp/pom.xml

@@ -1 @@
-
 <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/maven-v4_0_0.xsd">
@@ -5 +4 @@
     <groupId>eu.clarin.cmdi</groupId>
     <artifactId>vlo</artifactId>
-    <packaging>war</packaging>
+    <packaging>${packaging}</packaging>
     <version>2.5-SNAPSHOT</version>
     <name>VirtualLanguageObservatory</name>
@@ -136 +135 @@
                 </configuration>
             </plugin>
-            <!--
-              Assembly helper to create the Importer tool a command line tool which can help fill in a solr server with cmdi
-              files. Build the tool with: mvn -Dpackaging=jar -Dmaven.test.skip=true assembly:assembly This creates in
-              "target" a vlo_solr-1.0-SNAPSHOT-Importer directory with a bin and share directory. You can start the tool from
-              the bin dir.
-            -->
-            <!--<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <attach>false</attach>
-                    <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
-                    <descriptors>
-                        <descriptor>src/main/assembly/importer.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -165 +147 @@
                     </execution>
                 </executions>
+                <configuration>
+                    <classesDirectory>target/classes</classesDirectory>
+                    <includes>
+                        <include>**/*</include>
+                    </includes>
+                    <archive>
+                        <index>false</index>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>. lib/</classpathPrefix>
+                            <mainClass>eu.clarin.cmdi.vlo.importer.MetadataImporter</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
             </plugin>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                        <phase>package</phase> <!-- bind to the packaging phase -->
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>copy-dependencies</goal>
                         </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
     </build>

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

@@ -2 +2 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+    <!--
+                        Property placeholder that allows init parameters defined in servlet context to be used as property values
+                (in this case admin users list)
+                    -->
+    <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="location" value="classpath:application.properties" />
+    </bean>
+
     <bean id="configuration" class="eu.clarin.cmdi.vlo.Configuration" factory-method="getInstance">
-        <property name="solrUrl" value="http://localhost:8080/vlo_solr" />
+        <property name="solrUrl" value="${eu.clarin.cmdi.vlo.solrUrl}" />
+        <!--<property name="solrUrl" value="http://localhost:8080/vlo_solr" />-->
         <!--    <property name="solrUrl" value="http://lux16.mpi.nl:8080/vlo_solr" />-->
         <!--    <property name="solrUrl" value="http://catalog.clarin.eu:8080/vlo_solr" />-->
+        <property name="importerConfigFile" value="${eu.clarin.cmdi.vlo.importerConfigFile}" />
+
         <property name="IMDIBrowserUrl" value="http://corpus1.mpi.nl/ds/imdi_browser?openpath=" />
         <property name="handleServerUrl" value="http://hdl.handle.net/" />