Changeset 2641


Ignore:
Timestamp:
03/01/13 06:54:41 (11 years ago)
Author:
keeloo
Message:

ranches

Location:
vlo/branches/vlo-2.13-param
Files:
26 added
4 deleted
5 edited
59 copied
5 moved

Legend:

Unmodified
Added
Removed

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

    r2580 r2641  
    11<?xml version="1.0" encoding="UTF-8"?>
    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.0
    4                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
     2<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">
    53    <modelVersion>4.0.0</modelVersion>
    64    <groupId>eu.clarin.cmdi</groupId>
    … …  
    2220        <module>vlo_solr</module>
    2321        <module>vlo_webapp</module>
    24     </modules>
     22    <module>vlo_web_app</module>
     23  </modules>
    2524
    2625    <properties>
    … …  
    5150    </build>
    5251</project>
    53 

  • vlo/branches/vlo-2.13-param/vlo_webapp/nbactions.xml

    r2627 r2641  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<actions>
     3        <action>
     4            <actionName>run</actionName>
     5            <goals>
     6                <goal>process-classes</goal>
     7                <goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
     8            </goals>
     9            <properties>
     10                <exec.args>-classpath %classpath eu.clarin.cmdi.vlo.importer.MetadataImporter -c /Users/keeloo/VloConfig.xml</exec.args>
     11                <exec.executable>java</exec.executable>
     12                <exec.classpathScope>runtime</exec.classpathScope>
     13            </properties>
     14        </action>
     15        <action>
     16            <actionName>debug</actionName>
     17            <goals>
     18                <goal>process-classes</goal>
     19                <goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
     20            </goals>
     21            <properties>
     22                <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath eu.clarin.cmdi.vlo.importer.MetadataImporter -c /Users/keeloo/VloConfig.xml</exec.args>
     23                <exec.executable>java</exec.executable>
     24                <exec.classpathScope>runtime</exec.classpathScope>
     25                <jpda.listen>true</jpda.listen>
     26            </properties>
     27        </action>
     28        <action>
     29            <actionName>profile</actionName>
     30            <goals>
     31                <goal>process-classes</goal>
     32                <goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
     33            </goals>
     34            <properties>
     35                <exec.args>${profiler.args} -classpath %classpath eu.clarin.cmdi.vlo.importer.MetadataImporter -c /Users/keeloo/VloConfig.xml</exec.args>
     36                <exec.executable>${profiler.java}</exec.executable>
     37            </properties>
     38        </action>
    339           
    440</actions>

  • vlo/branches/vlo-2.13-param/vlo_webapp/pom.xml

    r2627 r2641  
    44    <groupId>eu.clarin.cmdi</groupId>
    55    <artifactId>vlo</artifactId>
    6     <packaging>${packaging}</packaging>
     6    <packaging>jar</packaging>
    77
    88    <!-- When updating the version number here, also update

  • vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java

    r2639 r2641  
    5858 * @author keeloo
    5959 */
    60 @Root
     60@Root(strict=false)
    6161public class VloConfig extends ConfigFromFile {
    6262

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

    r2639 r2641  
    407407                fileName = cmd.getOptionValue("c");
    408408               
    409                 // include the full path in the name
    410                 fileName = VloConfig.class.getResource(fileName).getFile();
    411 
    412409                // optionally, check for file existence here
    413410               
    414411                // read the configuration defined in the file
    415                 config = VloConfig.readConfig(fileName);
     412                config = VloConfig.readTestConfig(fileName);
    416413
    417414                // optionally, modify the configuration here
Note: See TracChangeset for help on using the changeset viewer.