You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2012/04/18 20:28:37 UTC
svn commit: r1327608 - in /lucene/dev/trunk: dev-tools/eclipse/
dev-tools/maven/solr/core/ solr/core/
solr/core/src/java/org/apache/solr/core/
solr/core/src/java/org/apache/solr/logging/log4j/ solr/lib/
Author: ryan
Date: Wed Apr 18 18:28:37 2012
New Revision: 1327608
URL: http://svn.apache.org/viewvc?rev=1327608&view=rev
Log:
SOLR-3358: remove log4j LogWatcher implementation
Removed:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/logging/log4j/
lucene/dev/trunk/solr/lib/log4j-1.2.16.jar.sha1
lucene/dev/trunk/solr/lib/log4j-LICENSE-ASL.txt
lucene/dev/trunk/solr/lib/log4j-NOTICE.txt
Modified:
lucene/dev/trunk/dev-tools/eclipse/dot.classpath
lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/trunk/solr/core/ivy.xml
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1327608&r1=1327607&r2=1327608&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Wed Apr 18 18:28:37 2012
@@ -110,7 +110,6 @@
<classpathentry kind="lib" path="solr/lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
- <classpathentry kind="lib" path="solr/lib/log4j-1.2.16.jar"/>
<classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
Modified: lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template?rev=1327608&r1=1327607&r2=1327608&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/core/pom.xml.template Wed Apr 18 18:28:37 2012
@@ -215,12 +215,6 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>provided</scope><!-- we only want this for compilation, at runtime use whatever you want -->
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/ivy.xml?rev=1327608&r1=1327607&r2=1327608&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/ivy.xml (original)
+++ lucene/dev/trunk/solr/core/ivy.xml Wed Apr 18 18:28:37 2012
@@ -25,7 +25,6 @@
<dependency org="org.apache.httpcomponents" name="httpcore" rev="4.1.4" transitive="false"/>
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.1.3" transitive="false"/>
<dependency org="org.apache.httpcomponents" name="httpmime" rev="4.1.3" transitive="false"/>
- <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.4" transitive="false"/>
<dependency org="commons-io" name="commons-io" rev="2.1" transitive="false"/>
<dependency org="commons-lang" name="commons-lang" rev="2.6" transitive="false"/>
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1327608&r1=1327607&r2=1327608&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java Wed Apr 18 18:28:37 2012
@@ -68,7 +68,6 @@ import org.apache.solr.handler.component
import org.apache.solr.logging.ListenerConfig;
import org.apache.solr.logging.LogWatcher;
import org.apache.solr.logging.jul.JulWatcher;
-import org.apache.solr.logging.log4j.Log4jWatcher;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.update.SolrCoreState;
import org.apache.zookeeper.KeeperException;
@@ -412,9 +411,9 @@ public class CoreContainer
if("JUL".equalsIgnoreCase(fname)) {
logging = new JulWatcher(slf4jImpl);
}
- else if( "Log4j".equals(fname) ) {
- logging = new Log4jWatcher(slf4jImpl);
- }
+// else if( "Log4j".equals(fname) ) {
+// logging = new Log4jWatcher(slf4jImpl);
+// }
else {
try {
logging = loader.newInstance(fname, LogWatcher.class);