aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/plugins
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-12-15 16:01:22 +0000
committerOlivier Lamy <olamy@apache.org>2011-12-15 16:01:22 +0000
commit6ec95cb8053e103d280667314ded6c970336a35a (patch)
tree80a0f5ba8a41630a98e4aabf2fc36fa34d7c3a96 /archiva-modules/plugins
parentc73cb26c0ffdda2c46e87a7595a96f22f37b5c13 (diff)
downloadarchiva-6ec95cb8053e103d280667314ded6c970336a35a.tar.gz
archiva-6ec95cb8053e103d280667314ded6c970336a35a.zip
add some debug to see what happened on the windauze jenkins node
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1214823 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/plugins')
-rw-r--r--archiva-modules/plugins/stage-repository-merge/pom.xml2
-rw-r--r--archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java2
-rw-r--r--archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml41
3 files changed, 44 insertions, 1 deletions
diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml
index 4c0ee37a2..6532835c4 100644
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
index ab7bd991c..5558c4d26 100644
--- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
+++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
@@ -148,6 +148,8 @@ public class Maven2RepositoryMerger
File targetArtifactFile = new File( targetRepoPath, artifactPath );
+ log.debug( "artifactPath {}", artifactPath );
+
int lastIndex = artifactPath.lastIndexOf( File.separatorChar );
File targetFile = new File( targetRepoPath, artifactPath.substring( 0, lastIndex ) );
diff --git a/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml b/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml
new file mode 100644
index 000000000..c07e3a4e7
--- /dev/null
+++ b/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
+ </layout>
+ </appender>
+
+
+ <logger name="org.apache.archiva.stagerepository.merge">
+ <level value="debug"/>
+ </logger>
+
+ <root>
+ <priority value ="info" />
+ <appender-ref ref="console" />
+ </root>
+
+</log4j:configuration>