Changeset 2768
- Timestamp:
- 04/02/13 10:03:37 (11 years ago)
- Location:
- vlo/trunk
- Files:
-
- 2 deleted
- 4 edited
- 165 copied
Legend:
- Unmodified
- Added
- Removed
-
vlo/trunk
-
Property
svn:mergeinfo
set to
/vlo/branches/vlo-2.13-param merged eligible
-
Property
svn:mergeinfo
set to
-
vlo/trunk/pom.xml
r2540 r2768 1 1 <?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 3 <project xmlns="http://maven.apache.org/POM/4.0.0" 4 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 5 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 6 http://maven.apache.org/xsd/maven-4.0.0.xsd" 7 > 8 5 9 <modelVersion>4.0.0</modelVersion> 6 10 <groupId>eu.clarin.cmdi</groupId> 7 11 <artifactId>vlo_parent</artifactId> 8 <name>Virtual Language Observatory (parent pom)</name>12 <name>Virtual Language Observatory</name> 9 13 <packaging>pom</packaging> 14 10 15 <!-- When updating the version number here, also update the version number 11 in the module's pom.xml --> 12 <version>2.12</version> 13 <description>Parent pom for the whole vlo project (in order to be able to do fancy packaging.</description> 16 in each module's pom.xml 17 --> 18 <version>2.13</version> 19 20 <description>Virtual Language Observatory (VLO) parent project</description> 14 21 15 <parent> 16 <groupId>nl.mpi</groupId> 17 <artifactId>parent</artifactId> 18 <version>1.2</version> 19 </parent> 22 <!-- maybe this was the culprit 23 <parent> 24 <groupId>nl.mpi</groupId> 25 <artifactId>parent</artifactId> 26 <version>1.2</version> 27 </parent> 28 --> 20 29 21 30 <modules> 22 31 <module>vlo_solr</module> 23 <module>vlo_webapp</module> 32 <module>vlo_web_app</module> 33 <module>vlo_importer</module> 24 34 </modules> 25 35 … … 51 61 </build> 52 62 </project> 53 -
vlo/trunk/src/main/assembly/installPackageBuilder.xml
r2062 r2768 20 20 <includeBaseDirectory>true</includeBaseDirectory> 21 21 <fileSets> 22 <!-- COOL SCRIPT FOR Application management --> 23 <fileSet> 24 <directory>src/main/resources</directory> 25 <includes> 26 <include>setvalues.pl</include> 27 </includes> 28 <fileMode>777</fileMode> 29 <outputDirectory>.</outputDirectory> 30 </fileSet> 22 31 23 <!-- DOCS --> 32 24 <fileSet> … … 38 30 </fileSet> 39 31 <fileSet> 40 <directory>vlo_web app</directory>32 <directory>vlo_web_app</directory> 41 33 <includes> 42 34 <include>CHANGES</include> … … 62 54 <!-- Jar File --> 63 55 <fileSet> 64 <directory>vlo_ webapp/target</directory>56 <directory>vlo_importer/target</directory> 65 57 <includes> 66 58 <include>*.jar</include> … … 70 62 <!-- run script --> 71 63 <fileSet> 72 <directory>vlo_ webapp/src/main/bin</directory>64 <directory>vlo_importer/src/main/bin</directory> 73 65 <includes> 74 66 <include>*.sh</include> … … 79 71 <!-- config files --> 80 72 <fileSet> 81 <directory>vlo_ webapp/src/main/bin</directory>73 <directory>vlo_importer/src/main/bin</directory> 82 74 <includes> 83 75 <include>*.properties</include> … … 86 78 </fileSet> 87 79 <fileSet> 88 <directory>vlo_ webapp/src/main/resources</directory>80 <directory>vlo_importer/src/main/resources</directory> 89 81 <includes> 90 <include> importerConfig.xml</include>91 <include> application.properties</include>82 <include>cmdi2xhtml.xsl</include> 83 <include>facetConcepts.xml</include> 92 84 <include>nationalProjectsMapping.xml</include> 85 <include>VloConfig.xml</include> 93 86 </includes> 94 87 <outputDirectory>bin</outputDirectory> 95 88 </fileSet> 96 <!-- VLO WAR FILE-->89 <!-- WEB APPLICATION --> 97 90 <!-- WAR FILE --> 98 91 <fileSet> 99 <directory>vlo_web app/target</directory>92 <directory>vlo_web_app/target</directory> 100 93 <includes> 101 94 <include>*.war</include> … … 105 98 <!-- config --> 106 99 <fileSet> 107 <directory>vlo_web app/src/main/resources</directory>100 <directory>vlo_web_app/src/main/resources</directory> 108 101 <includes> 109 <include> contextfragment.xml</include>102 <include>VloConfig.xml</include> 110 103 </includes> 111 104 <outputDirectory>config</outputDirectory> 112 </fileSet> 105 </fileSet> 113 106 114 <!-- SOLR -->107 <!-- SOLR SERVER --> 115 108 <!-- SOLR WAR FILE --> 116 109 <fileSet> -
vlo/trunk/vlo_solr/pom.xml
r2062 r2768 1 1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">3 <modelVersion>4.0.0</modelVersion>4 <groupId>eu.clarin.cmdi</groupId>5 <artifactId>vlo_solr</artifactId>6 <packaging>war</packaging>7 <version>3.6.0</version>8 <name>vlo_solr</name>9 <description>VLO Solr server configuration and installation project.</description>10 <dependencies>11 <dependency>12 <groupId>org.apache.solr</groupId>13 <artifactId>solr-core</artifactId>14 <version>3.6.0</version>15 16 <exclusion>17 18 19 </exclusion>20 </exclusions>21 </dependency>22 <dependency>23 <!-- PAY ATTENTION: when changing the version of the solr ALSO ALWAYS UPDATE the parent assembly xml-->24 <groupId>org.apache.solr</groupId>25 <artifactId>solr-dataimporthandler</artifactId>26 <version>3.6.0</version>27 </dependency>28 <dependency>29 <groupId>org.apache.solr</groupId>30 <artifactId>solr-solrj</artifactId>31 <version>3.6.0</version>32 </dependency>33 <dependency>34 <groupId>org.slf4j</groupId>35 <artifactId>slf4j-log4j12</artifactId>36 <version>1.6.6</version>37 </dependency>38 <dependency>39 <groupId>log4j</groupId>40 <artifactId>log4j</artifactId>41 <version>1.2.14</version>42 </dependency>43 </dependencies>2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 3 <modelVersion>4.0.0</modelVersion> 4 <groupId>eu.clarin.cmdi</groupId> 5 <artifactId>vlo_solr</artifactId> 6 <packaging>war</packaging> 7 <version>3.6.0</version> 8 <name>vlo_solr</name> 9 <description>VLO Solr server configuration and installation project.</description> 10 <dependencies> 11 <dependency> 12 <groupId>org.apache.solr</groupId> 13 <artifactId>solr-core</artifactId> 14 <version>3.6.0</version> 15 <exclusions> 16 <exclusion> 17 <groupId>woodstox</groupId> 18 <artifactId>wstx-asl</artifactId> 19 </exclusion> 20 </exclusions> 21 </dependency> 22 <dependency> 23 <!-- PAY ATTENTION: when changing the version of the solr ALSO ALWAYS UPDATE the parent assembly xml--> 24 <groupId>org.apache.solr</groupId> 25 <artifactId>solr-dataimporthandler</artifactId> 26 <version>3.6.0</version> 27 </dependency> 28 <dependency> 29 <groupId>org.apache.solr</groupId> 30 <artifactId>solr-solrj</artifactId> 31 <version>3.6.0</version> 32 </dependency> 33 <dependency> 34 <groupId>org.slf4j</groupId> 35 <artifactId>slf4j-log4j12</artifactId> 36 <version>1.6.6</version> 37 </dependency> 38 <dependency> 39 <groupId>log4j</groupId> 40 <artifactId>log4j</artifactId> 41 <version>1.2.14</version> 42 </dependency> 43 </dependencies> 44 44 45 <properties>46 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>47 <vlo.solr.home>[[PACKAGEDIR]]</vlo.solr.home>48 <vlo.solr.conf>config/solr</vlo.solr.conf>49 <!-- <vlo.solr.home>/lat/tools/vlo_solr</vlo.solr.home>-->50 <vlo.war.name>war/solr/</vlo.war.name>51 </properties>45 <properties> 46 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 47 <vlo.solr.home>${project.build.directory}</vlo.solr.home> 48 <vlo.solr.conf>${project.build.finalName}-vlo_solr_conf/solr</vlo.solr.conf> 49 <vlo.war.name>war/solr/</vlo.war.name> 50 <netbeans.hint.deploy.server>Tomcat</netbeans.hint.deploy.server> 51 </properties> 52 52 53 <build> 54 <resources> 55 <resource> 56 <filtering>true</filtering> 57 <directory>src/main/resources</directory> 58 </resource> 59 </resources> 60 <plugins> 61 <plugin> 62 <groupId>org.apache.maven.plugins</groupId> 63 <artifactId>maven-assembly-plugin</artifactId> 64 <configuration> 65 <descriptors> 66 <descriptor>src/main/assembly/vlo_solr_install_dir.xml</descriptor> 67 </descriptors> 68 </configuration> 69 <executions> 70 <execution> 71 <id>make-assembly</id> 72 <phase>package</phase> 73 <goals> 74 <goal>single</goal> 75 </goals> 76 </execution> 77 </executions> 78 </plugin> 79 </plugins> 80 </build> 53 <build> 54 <resources> 55 <resource> 56 <filtering>true</filtering> 57 <directory>src/main/resources</directory> 58 </resource> 59 </resources> 60 <plugins> 61 <plugin> 62 <groupId>org.apache.maven.plugins</groupId> 63 <artifactId>maven-assembly-plugin</artifactId> 64 <configuration> 65 <descriptors> 66 <descriptor>src/main/assembly/vlo_solr_install_dir.xml</descriptor> 67 </descriptors> 68 </configuration> 69 <executions> 70 <execution> 71 <id>make-assembly</id> 72 <phase>package</phase> 73 <goals> 74 <goal>single</goal> 75 </goals> 76 </execution> 77 </executions> 78 </plugin> 79 80 <plugin> 81 <groupId>org.apache.maven.plugins</groupId> 82 <artifactId>maven-war-plugin</artifactId> 83 <configuration> 84 <!--<warName>${project.artifactId}</warName>--> 85 <webResources> 86 <resource> 87 <directory>src/main/webapp</directory> 88 <filtering>true</filtering> 89 </resource> 90 </webResources> 91 <archive> 92 <manifest> 93 <addDefaultImplementationEntries>true</addDefaultImplementationEntries> 94 </manifest> 95 </archive> 96 </configuration> 97 </plugin> 98 99 </plugins> 100 </build> 81 101 82 102 </project>
Note: See TracChangeset
for help on using the changeset viewer.