diff --git a/.gitignore b/.gitignore
index 08b9a4b1..425a6cfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
/build.properties
/runtime.properties
/ontology/public/catalog-v0001.xml
+settings.xml
rdf/auth/firsttime/test-user-model.owl
utilities/solrtester/.work
@@ -11,8 +12,8 @@ utilities/rdbmigration/.work
**/.idea
**/*.iml
**/target
-
**/overlays
+*~
# Eclipse artifacts
**/.settings
diff --git a/installer/pom.xml b/installer/pom.xml
index 4650d6de..e51aa26e 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -105,18 +105,11 @@
home
- solr
webapp
-
- org.vivoweb
- vitro-solr
- ${vitro-version}
- war
-
org.vivoweb
vivo-home
diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml
deleted file mode 100644
index 63fb2130..00000000
--- a/installer/solr/pom.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-
-
- 4.0.0
-
- org.vivoweb
- vivo-installer-solr
- 1.11.0-SNAPSHOT
- war
-
-
- org.vivoweb
- vivo-installer
- 1.11.0-SNAPSHOT
- ..
-
-
- VIVO Install Solr App
-
-
-
- package
-
- app-name
-
-
- ${app-name}solr
-
-
- maven-war-plugin
-
-
-
- true
-
-
- false
-
-
- org.vivoweb
- vitro-solr
- war
-
-
-
-
- src/main/webResources
- true
-
-
-
-
-
-
-
-
- pinstall
-
- tomcat-dir
-
-
-
-
- maven-antrun-plugin
-
-
- remove-webapp
- verify
-
- run
-
-
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- install
- install
-
- unpack
-
-
-
-
- ${project.groupId}
- ${project.artifactId}
- ${project.version}
- war
- true
- ${tomcat-dir}/webapps/${project.build.finalName}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- maven-install-plugin
-
- true
-
-
-
- maven-clean-plugin
-
-
-
- overlays
-
-
-
-
-
-
-
-
-
- org.vivoweb
- vitro-solr
- war
-
-
-
diff --git a/installer/solr/src/main/webResources/META-INF/context.xml b/installer/solr/src/main/webResources/META-INF/context.xml
deleted file mode 100644
index 51e4c1b8..00000000
--- a/installer/solr/src/main/webResources/META-INF/context.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
diff --git a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
deleted file mode 100644
index b8307c2b..00000000
--- a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
+++ /dev/null
@@ -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