Refine the installation process for Solr 4.7.2

solr/additions-to-solr-war/WEB-INF/classes/log4j.properties

@@ -0,0 +1,13 @@
+log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender 
+log4j.appender.AllAppender.File= ${catalina.home}/logs/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

webapp/build.xml

@@ -419,10 +419,11 @@
 			<fileset dir="${solr.template.dir}/homeDirectoryTemplate" />
 		</copy>
 
-		<!-- create an unpacked image of the Solr WAR, with our config options -->
+		<!-- create an unpacked image of the Solr WAR -->
 		<unwar src="${solr.template.dir}/solr-4.7.2.war" dest="${solr.webapp.dir}" />
-		<copy todir="${solr.webapp.dir}/WEB-INF/classes">
-			<fileset dir="${appbase.dir}/config/solr/" />
+		<!-- add logging JARs and logging options that Solr doesn't include -->
+		<copy todir="${solr.webapp.dir}">
+			<fileset dir="${solr.template.dir}/additions-to-solr-war/" />
 		</copy>
 	</target>
 

webapp/config/solr/logging.properties

@@ -1,26 +0,0 @@
-############################################################
-# logging parameters for Solr
-# see http://tomcat.apache.org/tomcat-6.0-doc/logging.html#Using_java.util.logging_%28default%29
-############################################################
-
-handlers = org.apache.juli.FileHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-org.apache.juli.FileHandler.level = INFO
-org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-org.apache.juli.FileHandler.prefix = solr.
-org.apache.juli.FileHandler.formatter = java.util.logging.SimpleFormatter
-
-############################################################
-# Special handling for classes that need to be less chatty 
-# than the overall level.
-############################################################
-
-# Make all of the Solr classes quieter...
-org.apache.solr.level = WARNING
-# ...except for this one.
-org.apache.solr.core.SolrResourceLoader.level = INFO