You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/05/23 14:54:23 UTC
svn commit: r1485674 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/licenses/ lucene/replicator/
lucene/replicator/src/test/org/apache/lucene/replicator/http/
Author: rmuir
Date: Thu May 23 12:54:22 2013
New Revision: 1485674
URL: http://svn.apache.org/r1485674
Log:
fix dependencies so logging works from replicator/ tests, turn on debugging
Added:
lucene/dev/branches/branch_4x/lucene/licenses/commons-logging-1.1.3.jar.sha1
- copied unchanged from r1485672, lucene/dev/trunk/lucene/licenses/commons-logging-1.1.3.jar.sha1
lucene/dev/branches/branch_4x/lucene/licenses/commons-logging-LICENSE-ASL.txt
- copied unchanged from r1485672, lucene/dev/trunk/lucene/licenses/commons-logging-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/lucene/licenses/commons-logging-NOTICE.txt
- copied unchanged from r1485672, lucene/dev/trunk/lucene/licenses/commons-logging-NOTICE.txt
Removed:
lucene/dev/branches/branch_4x/lucene/licenses/jcl-over-slf4j-1.6.6.jar.sha1
lucene/dev/branches/branch_4x/lucene/licenses/slf4j-api-1.6.6.jar.sha1
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/replicator/ (props changed)
lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml
lucene/dev/branches/branch_4x/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java
Modified: lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml?rev=1485674&r1=1485673&r2=1485674&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/replicator/ivy.xml Thu May 23 12:54:22 2013
@@ -39,8 +39,7 @@
<dependency org="org.eclipse.jetty" name="jetty-io" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-continuation" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-http" rev="&jetty.version;" transitive="false" conf="jetty->default"/>
- <dependency org="org.slf4j" name="slf4j-api" rev="1.6.6" transitive="false" conf="logging->default"/>
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.6" transitive="false" conf="logging->default"/>
+ <dependency org="commons-logging" name="commons-logging" rev="1.1.3" transitive="false" conf="logging->default"/>
<dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016" transitive="false" conf="servlet->default">
<artifact name="javax.servlet" type="orbit" ext="jar"/>
</dependency>
Modified: lucene/dev/branches/branch_4x/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java?rev=1485674&r1=1485673&r2=1485674&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java Thu May 23 12:54:22 2013
@@ -65,6 +65,7 @@ public class HttpReplicatorTest extends
@Override
public void setUp() throws Exception {
super.setUp();
+ System.setProperty("org.eclipse.jetty.LEVEL", "DEBUG"); // sets stderr logging to DEBUG level
clientWorkDir = _TestUtil.getTempDir("httpReplicatorTest");
handlerIndexDir = newDirectory();
serverIndexDir = newDirectory();
@@ -81,6 +82,7 @@ public class HttpReplicatorTest extends
public void tearDown() throws Exception {
stopHttpServer(server);
IOUtils.close(reader, writer, handlerIndexDir, serverIndexDir);
+ System.clearProperty("org.eclipse.jetty.LEVEL");
super.tearDown();
}