Remove embedded Solr
Related to: https://jira.duraspace.org/browse/VIVO-1592
This commit is contained in:
Andrew Woods
parent
8d6cc7a3c9
commit
c37a46537d
5 changed files with 2 additions and 170 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -3,6 +3,7 @@
|
||||||
/build.properties
|
/build.properties
|
||||||
/runtime.properties
|
/runtime.properties
|
||||||
/ontology/public/catalog-v0001.xml
|
/ontology/public/catalog-v0001.xml
|
||||||
|
settings.xml
|
||||||
|
|
||||||
rdf/auth/firsttime/test-user-model.owl
|
rdf/auth/firsttime/test-user-model.owl
|
||||||
utilities/solrtester/.work
|
utilities/solrtester/.work
|
||||||
|
|
@ -11,8 +12,8 @@ utilities/rdbmigration/.work
|
||||||
**/.idea
|
**/.idea
|
||||||
**/*.iml
|
**/*.iml
|
||||||
**/target
|
**/target
|
||||||
|
|
||||||
**/overlays
|
**/overlays
|
||||||
|
*~
|
||||||
|
|
||||||
# Eclipse artifacts
|
# Eclipse artifacts
|
||||||
**/.settings
|
**/.settings
|
||||||
|
|
|
||||||
|
|
@ -105,18 +105,11 @@
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>home</module>
|
<module>home</module>
|
||||||
<module>solr</module>
|
|
||||||
<module>webapp</module>
|
<module>webapp</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
|
||||||
<groupId>org.vivoweb</groupId>
|
|
||||||
<artifactId>vitro-solr</artifactId>
|
|
||||||
<version>${vitro-version}</version>
|
|
||||||
<type>war</type>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.vivoweb</groupId>
|
<groupId>org.vivoweb</groupId>
|
||||||
<artifactId>vivo-home</artifactId>
|
<artifactId>vivo-home</artifactId>
|
||||||
|
|
|
||||||
|
|
@ -1,140 +0,0 @@
|
||||||
<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>vivo-installer-solr</artifactId>
|
|
||||||
<version>1.11.0-SNAPSHOT</version>
|
|
||||||
<packaging>war</packaging>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>org.vivoweb</groupId>
|
|
||||||
<artifactId>vivo-installer</artifactId>
|
|
||||||
<version>1.11.0-SNAPSHOT</version>
|
|
||||||
<relativePath>..</relativePath>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<name>VIVO Install Solr App</name>
|
|
||||||
|
|
||||||
<profiles>
|
|
||||||
<profile>
|
|
||||||
<id>package</id>
|
|
||||||
<activation>
|
|
||||||
<property><name>app-name</name></property>
|
|
||||||
</activation>
|
|
||||||
<build>
|
|
||||||
<finalName>${app-name}solr</finalName>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-war-plugin</artifactId>
|
|
||||||
<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>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>pinstall</id>
|
|
||||||
<activation>
|
|
||||||
<property><name>tomcat-dir</name></property>
|
|
||||||
</activation>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>remove-webapp</id>
|
|
||||||
<phase>verify</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>run</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<tasks>
|
|
||||||
<delete dir="${tomcat-dir}/webapps/${project.build.finalName}" />
|
|
||||||
</tasks>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
|
||||||
<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/${project.build.finalName}</outputDirectory>
|
|
||||||
</artifactItem>
|
|
||||||
</artifactItems>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-install-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<skip>true</skip>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<filesets>
|
|
||||||
<fileset>
|
|
||||||
<directory>overlays</directory>
|
|
||||||
</fileset>
|
|
||||||
</filesets>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.vivoweb</groupId>
|
|
||||||
<artifactId>vitro-solr</artifactId>
|
|
||||||
<type>war</type>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
<Context crossContext="true" override="true">
|
|
||||||
<Environment
|
|
||||||
type="java.lang.String"
|
|
||||||
name="solr/home"
|
|
||||||
value="${vivo-dir}/solr" override="true"/>
|
|
||||||
|
|
||||||
<!-- Disable persist sessions on shut down.-->
|
|
||||||
<Manager pathname="" />
|
|
||||||
</Context>
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
|
|
||||||
log4j.appender.AllAppender.File= ${catalina.base}/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
|
|
||||||
Loading…
Add table
Reference in a new issue