diff --git a/installer/home/pom.xml b/installer/home/pom.xml
index 45edd7d7..5afdf779 100644
--- a/installer/home/pom.xml
+++ b/installer/home/pom.xml
@@ -39,6 +39,27 @@
                     </execution>
                 </executions>
             </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>
                 <artifactId>maven-install-plugin</artifactId>
                 <version>2.5.2</version>
@@ -52,7 +73,7 @@
     <dependencies>
         <dependency>
             <groupId>org.vivoweb</groupId>
-            <artifactId>vitro-home</artifactId>
+            <artifactId>vivo-home</artifactId>
             <version>1.9.0-SNAPSHOT</version>
             <type>tar.gz</type>
         </dependency>
diff --git a/installer/home/src/main/assembly/home.xml b/installer/home/src/main/assembly/home.xml
index e1dd22a7..decd7b06 100644
--- a/installer/home/src/main/assembly/home.xml
+++ b/installer/home/src/main/assembly/home.xml
@@ -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">
     <id>home</id>
     <formats>
-        <format>tar.gz</format>
+        <format>dir</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <dependencySets>
diff --git a/installer/pom.xml b/installer/pom.xml
index 67253b06..570f9741 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -12,9 +12,15 @@
 
     <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>
         <plugins>
-            <plugin>
+            <!-- plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven2-plugin</artifactId>
                 <version>1.4.16</version>
@@ -63,27 +69,20 @@
                         </configuration>
                     </execution>
                 </executions>
+            </plugin -->
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
         </plugins>
     </build>
 
     <modules>
         <module>home</module>
+        <module>solr</module>
         <module>webapp</module>
     </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>
diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml
new file mode 100644
index 00000000..b9407ca9
--- /dev/null
+++ b/installer/solr/pom.xml
@@ -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>
diff --git a/installer/solr/src/main/webResources/META-INF/context.xml b/installer/solr/src/main/webResources/META-INF/context.xml
new file mode 100644
index 00000000..a271ffdd
--- /dev/null
+++ b/installer/solr/src/main/webResources/META-INF/context.xml
@@ -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>
diff --git a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
new file mode 100644
index 00000000..6d55b17c
--- /dev/null
+++ b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties
@@ -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
diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml
index 251bcea3..d50230c1 100644
--- a/installer/webapp/pom.xml
+++ b/installer/webapp/pom.xml
@@ -35,7 +35,6 @@
                         </manifest>
                     </archive>
                     <archiveClasses>false</archiveClasses>
-                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
                     <overlays>
                         <overlay>
                             <groupId>org.vivoweb</groupId>
@@ -43,10 +42,37 @@
                             <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>
-                        <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>
                 </executions>
             </plugin>
@@ -61,16 +87,16 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vivo-api</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.vivoweb</groupId>
             <artifactId>vivo-webapp</artifactId>
             <version>1.9.0-SNAPSHOT</version>
             <type>war</type>
         </dependency>
-        <dependency>
-            <groupId>org.vivoweb</groupId>
-            <artifactId>vivo-api</artifactId>
-            <version>1.9.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/installer/webapp/src/main/webResources/META-INF/context.xml b/installer/webapp/src/main/webResources/META-INF/context.xml
new file mode 100644
index 00000000..186fb59b
--- /dev/null
+++ b/installer/webapp/src/main/webResources/META-INF/context.xml
@@ -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>
diff --git a/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties
new file mode 100644
index 00000000..f9d04c7a
--- /dev/null
+++ b/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties
@@ -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
diff --git a/webapp/pom.xml b/webapp/pom.xml
index ee4b8dc4..15d83636 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -26,12 +26,13 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.6</version>
                 <configuration>
+                    <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+                    <archiveClasses>false</archiveClasses>
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
                         </manifest>
                     </archive>
-                    <archiveClasses>false</archiveClasses>
                     <overlays>
                         <overlay>
                             <groupId>org.vivoweb</groupId>
@@ -40,11 +41,6 @@
                         </overlay>
                     </overlays>
                 </configuration>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/webapp/src/main/webResources/WEB-INF/resources/build.properties b/webapp/src/main/webResources/WEB-INF/resources/build.properties
deleted file mode 100644
index 6cf589fc..00000000
--- a/webapp/src/main/webResources/WEB-INF/resources/build.properties
+++ /dev/null
@@ -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}