You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2015/02/06 13:10:28 UTC
[5/7] archiva-redback-core git commit: make test logging working
make test logging working
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/0e1a45a7
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/0e1a45a7
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/0e1a45a7
Branch: refs/heads/master
Commit: 0e1a45a71650a3d872d899d7b62501ca751c0984
Parents: 8bdcfbb
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri Jan 30 14:59:15 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Feb 5 21:35:04 2015 +1100
----------------------------------------------------------------------
pom.xml | 7 ++++---
.../redback-rest/redback-rest-services/pom.xml | 15 ++++++++++++++-
.../services/interceptors/AbstractInterceptor.java | 2 +-
.../interceptors/AuthenticationInterceptor.java | 2 +-
.../interceptors/DebugJAXRSInInterceptor.java | 3 ++-
.../interceptors/PermissionsInterceptor.java | 3 ++-
.../interceptors/ThreadLocalUserCleaner.java | 4 +++-
.../rest/services/AbstractRestServicesTest.java | 5 +++++
.../src/test/resources/log4j2-test.xml | 14 ++++++++------
9 files changed, 40 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0e1a45a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45a52f3..da8f481 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<properties>
<springVersion>4.1.4.RELEASE</springVersion>
- <slf4jVersion>1.7.7</slf4jVersion>
+ <slf4jVersion>1.7.10</slf4jVersion>
<log4j2Version>2.1</log4j2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -663,7 +663,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
@@ -673,7 +673,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>1.6.0</version>
+ <version>1.7.1</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -739,6 +739,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx256m -Xms256m</argLine>
+ <runOrder>alphabetical</runOrder>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0e1a45a7/redback-integrations/redback-rest/redback-rest-services/pom.xml
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 5bd18df..d7c21cc 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -176,6 +176,19 @@
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2Version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
@@ -237,7 +250,7 @@
org.apache.archiva.redback.users;version=${project.version},
org.apache.commons.io;version="[1.4,2)",
org.apache.commons.lang;version="[2.6,3)",
- org.apache.cxf*;version="[3.0.3)",
+ org.apache.cxf*;version="[3.0.3,4)",
com.fasterxml.jackson.databind;version="[2.2,3)",
org.codehaus.plexus.util;version="[3,4)",
org.springframework*;version="[3,4)",
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0e1a45a7/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AbstractInterceptor.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AbstractInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AbstractInterceptor.java
index 040f381..45b3031 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AbstractInterceptor.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AbstractInterceptor.java
@@ -37,7 +37,7 @@ import java.lang.reflect.Method;
public abstract class AbstractInterceptor
{
- private Logger log = LoggerFactory.getLogger( getClass() );
+ private final Logger log = LoggerFactory.getLogger( getClass() );
@Context
private HttpServletRequest httpServletRequest;
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0e1a45a7/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java
index 8489aef..ae16637 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java
@@ -71,7 +71,7 @@ public class AuthenticationInterceptor
@Named(value = "httpAuthenticator#basic")
private HttpBasicAuthentication httpAuthenticator;
- private Logger log = LoggerFactory.getLogger( getClass() );
+ private final Logger log = LoggerFactory.getLogger( getClass() );
public void filter( ContainerRequestContext containerRequestContext )
{
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0e1a45a7/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/DebugJAXRSInInterceptor.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/DebugJAXRSInInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/DebugJAXRSInInterceptor.java
index 994db06..340d6a1 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/DebugJAXRSInInterceptor.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/DebugJAXRSInInterceptor.java
@@ -26,7 +26,8 @@ import org.apache.cxf.message.Message;
* @author Olivier Lamy
* @since 1.3
*/
-public class DebugJAXRSInInterceptor extends JAXRSInInterceptor
+public class DebugJAXRSInInterceptor
+ extends JAXRSInInterceptor
{
@Override
public void handleMessage( Message message )
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0e1a45a7/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java
index be877db..23fba4a 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java
@@ -62,7 +62,7 @@ public class PermissionsInterceptor
@Named( value = "httpAuthenticator#basic" )
private HttpBasicAuthentication httpAuthenticator;
- private Logger log = LoggerFactory.getLogger( getClass() );
+ private final Logger log = LoggerFactory.getLogger( getClass() );
public void filter( ContainerRequestContext containerRequestContext )
{
@@ -151,6 +151,7 @@ public class PermissionsInterceptor
{
log.debug( "user {} not authenticated", securitySession.getUser().getUsername() );
}
+ return;
}
}
else
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0e1a45a7/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/ThreadLocalUserCleaner.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/ThreadLocalUserCleaner.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/ThreadLocalUserCleaner.java
index d938938..861ef0c 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/ThreadLocalUserCleaner.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/ThreadLocalUserCleaner.java
@@ -32,17 +32,19 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
/**
* @author Olivier Lamy
* @since 1.4
*/
@Service( "threadLocalUserCleaner#rest" )
+@Provider
public class ThreadLocalUserCleaner
extends AbstractPhaseInterceptor<Message>
implements PhaseInterceptor<Message>
{
- private Logger log = LoggerFactory.getLogger( getClass() );
+ private final Logger log = LoggerFactory.getLogger( getClass() );
public ThreadLocalUserCleaner( String phase )
{
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0e1a45a7/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java
index b0240c5..806f322 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java
@@ -41,6 +41,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.bridge.SLF4JBridgeHandler;
import org.springframework.web.context.ContextLoaderListener;
import javax.ws.rs.core.MediaType;
@@ -98,6 +99,10 @@ public abstract class AbstractRestServicesTest
throws Exception
{
+ SLF4JBridgeHandler.removeHandlersForRootLogger();
+
+ SLF4JBridgeHandler.install();
+
tomcat = new Tomcat();
tomcat.setBaseDir( System.getProperty( "java.io.tmpdir" ) );
tomcat.setPort( 0 );
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/0e1a45a7/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j2-test.xml
----------------------------------------------------------------------
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j2-test.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j2-test.xml
index 8496a73..33521cf 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j2-test.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j2-test.xml
@@ -17,24 +17,26 @@
~ specific language governing permissions and limitations
~ under the License.
-->
+<configuration> <!-- status="debug" -->
-
-<configuration status="debug">
<appenders>
<Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+ <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n}" />
</Console>
</appenders>
- <loggers>
+ <loggers>
<logger name="org.springframework" level="info"/>
-
<logger name="org.apache.cxf" level="info"/>
-
+ <logger name="org.springframework" level="error"/>
+ <logger name="org.apache.archiva.redback.components.cache" level="error"/>
+ <logger name="org.apache.archiva.redback.rest.services.interceptors" level="debug"/>
+ <logger name="JPOX" level="ERROR"/>
<root level="info">
<appender-ref ref="console"/>
</root>
</loggers>
+
</configuration>