litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Maven (second draft)

Browse source
This commit is contained in:
Graham Triggs 2015-11-20 21:21:25 +00:00
parent fee48b0b50
commit 7fe1b73093
11 changed files with 246 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
installer/home/pom.xml
View file

@ -39,6 +39,27 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${home-dir}</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}/${project.build.finalName}</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version> <version>2.5.2</version>
@ -52,7 +73,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vitro-home</artifactId> <artifactId>vivo-home</artifactId>
<version>1.9.0-SNAPSHOT</version> <version>1.9.0-SNAPSHOT</version>
<type>tar.gz</type> <type>tar.gz</type>
</dependency> </dependency>

2
installer/home/src/main/assembly/home.xml
View file

@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>home</id> <id>home</id>
<formats> <formats>
<format>tar.gz</format> <format>dir</format>
</formats> </formats>
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<dependencySets> <dependencySets>

31
installer/pom.xml
View file

@ -12,9 +12,15 @@
<name>VIVO Installer</name> <name>VIVO Installer</name>
<properties>
<app-name>vivo</app-name>
<home-dir>/usr/local/vivo/home</home-dir>
<tomcat-dir>/usr/local/tomcat</tomcat-dir>
</properties>
<build> <build>
<plugins> <plugins>
<plugin> <!-- plugin>
<groupId>org.codehaus.cargo</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId> <artifactId>cargo-maven2-plugin</artifactId>
<version>1.4.16</version> <version>1.4.16</version>
@ -63,27 +69,20 @@
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin -->
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<modules> <modules>
<module>home</module> <module>home</module>
<module>solr</module>
<module>webapp</module> <module>webapp</module>
</modules> </modules>
<!-- dependencies>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-home</artifactId>
<version>1.9.0-SNAPSHOT</version>
<type>tar.gz</type>
</dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-webapp</artifactId>
<version>1.9.0-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies -->
</project> </project>

93
installer/solr/pom.xml Normal file
View file

@ -0,0 +1,93 @@
<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>
<groupId>org.vivoweb</groupId>
<artifactId>solr</artifactId>
<version>1.9.0-SNAPSHOT</version>
<packaging>war</packaging>
<parent>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-installer</artifactId>
<version>1.9.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<name>VIVO Prepare Solr App</name>
<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
</manifest>
</archive>
<archiveClasses>false</archiveClasses>
<overlays>
<overlay>
<groupId>org.vivoweb</groupId>
<artifactId>vitro-solr</artifactId>
<type>war</type>
</overlay>
</overlays>
<webResources>
<resource>
<directory>src/main/webResources</directory>
<filtering>true</filtering>
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${tomcat-dir}/webapps/${app-name}solr</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vitro-solr</artifactId>
<version>1.9.0-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
</project>

9
installer/solr/src/main/webResources/META-INF/context.xml Normal file
View file

@ -0,0 +1,9 @@
<Context crossContext="true" override="true">
<Environment
type="java.lang.String"
name="solr/home"
value="${home-dir}/solr" override="true"/>
<!-- Disable persist sessions on shut down.-->
<Manager pathname="" />
</Context>

13
installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties Normal file
View file

@ -0,0 +1,13 @@
log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
log4j.appender.AllAppender.File= ${catalina.home}/logs/${app-name}solr.log
log4j.appender.AllAppender.MaxFileSize=10MB
log4j.appender.AllAppender.MaxBackupIndex=10
log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n
log4j.rootLogger=INFO, AllAppender
# Make all of the Solr classes quieter...
log4j.logger.org.apache.solr.level = WARNING
# ...except for this one.
log4j.logger.org.apache.solr.core.SolrResourceLoader.level = INFO

40
installer/webapp/pom.xml
View file

@ -35,7 +35,6 @@
</manifest> </manifest>
</archive> </archive>
<archiveClasses>false</archiveClasses> <archiveClasses>false</archiveClasses>
<filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
<overlays> <overlays>
<overlay> <overlay>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
@ -43,10 +42,37 @@
<type>war</type> <type>war</type>
</overlay> </overlay>
</overlays> </overlays>
<webResources>
<resource>
<directory>src/main/webResources</directory>
<filtering>true</filtering>
</resource>
</webResources>
</configuration> </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions> <executions>
<execution> <execution>
<phase>prepare-package</phase> <id>install</id>
<phase>install</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${tomcat-dir}/webapps/${app-name}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -61,16 +87,16 @@
</build> </build>
<dependencies> <dependencies>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-api</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
<artifactId>vivo-webapp</artifactId> <artifactId>vivo-webapp</artifactId>
<version>1.9.0-SNAPSHOT</version> <version>1.9.0-SNAPSHOT</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-api</artifactId>
<version>1.9.0-SNAPSHOT</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

9
installer/webapp/src/main/webResources/META-INF/context.xml Normal file
View file

@ -0,0 +1,9 @@
<Context crossContext="true" override="true">
<Environment
type="java.lang.String"
name="vitro/home"
value="${home-dir}" override="true"/>
<!-- Disable persist sessions on shut down.-->
<Manager pathname="" />
</Context>

49
installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties Normal file
View file

@ -0,0 +1,49 @@
#
# This file sets the log levels for the Vitro webapp.
#
# There are 8 principal logging levels, as follows:
# <-- more messages ALL TRACE DEBUG INFO WARN ERROR FATAL OFF fewer messages -->
#
# The default logging level is specified on the rootLogger. Other levels can be
# set for individual classes or packages as desired.
#
# Examples of setting levels:
# log4j.logger.edu.cornell.mannlib.vitro.webapp.ConfigurationProperties=INFO
# -- sets INFO level for this one class
# log4j.logger.org.apache.catalina=INFO
# -- sets INFO level for all classes in "org.apache.catalina" package
# and any sub-packages.
#
# Documentation for this file can be found here:
# http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PropertyConfigurator.html#doConfigure(java.lang.String,%20org.apache.log4j.spi.LoggerRepository)
#
# More information can be found here:
# http://logging.apache.org/log4j/1.2/manual.html
#
# The "production" version of this file is log4j.properties.
# debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion.
log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
log4j.appender.AllAppender.File= ${catalina.home}/logs/${app-name}.all.log
log4j.appender.AllAppender.MaxFileSize=10MB
log4j.appender.AllAppender.MaxBackupIndex=10
log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n
log4j.rootLogger=INFO, AllAppender
# These classes are too chatty to display INFO messages.
log4j.logger.edu.cornell.mannlib.vitro.webapp.startup.StartupStatus=WARN
log4j.logger.edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase=WARN
log4j.logger.org.semanticweb.owlapi.rdf.rdfxml.parser=WARN
# Spring as a whole is too chatty to display INFO messages.
log4j.logger.org.springframework=WARN
# suppress odd warnings from libraries
log4j.logger.com.hp.hpl.jena.sdb.layout2.LoaderTuplesNodes=FATAL
log4j.logger.com.hp.hpl.jena.sdb.sql.SDBConnection=ERROR
log4j.logger.org.openjena.riot=FATAL
log4j.logger.org.apache.jena.riot=FATAL
log4j.logger.org.directwebremoting=FATAL

8
webapp/pom.xml
View file

@ -26,12 +26,13 @@
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.6</version> <version>2.6</version>
<configuration> <configuration>
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
<archiveClasses>false</archiveClasses>
<archive> <archive>
<manifest> <manifest>
<addClasspath>true</addClasspath> <addClasspath>true</addClasspath>
</manifest> </manifest>
</archive> </archive>
<archiveClasses>false</archiveClasses>
<overlays> <overlays>
<overlay> <overlay>
<groupId>org.vivoweb</groupId> <groupId>org.vivoweb</groupId>
@ -40,11 +41,6 @@
</overlay> </overlay>
</overlays> </overlays>
</configuration> </configuration>
<executions>
<execution>
<phase>prepare-package</phase>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

23
webapp/src/main/webResources/WEB-INF/resources/build.properties
View file

@ -1,23 +0,0 @@
# -----------------------------------------------------------------------------
#
# VIVO build properties
#
# This file is provided as example.build.properties.
#
# Save a copy of this file as build.properties, and edit the properties as
# needed for your deployment.
#
# -----------------------------------------------------------------------------
#
# The base install directory for your Tomcat server. The VIVO application
# will be deployed in the /webapps directory below this base.
#
tomcat.home = ${tomcat.home}
#
# The location where the VIVO application will store the data that it creates.
# This includes uploaded files (usually images) and the search index.
#
vitro.home = ${vitro.home}