Maven (second draft)

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>

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>

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