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 2011/12/15 17:01:23 UTC
svn commit: r1214823 - in
/archiva/trunk/archiva-modules/plugins/stage-repository-merge: pom.xml
src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
src/test/resources/log4j.xml
Author: olamy
Date: Thu Dec 15 16:01:22 2011
New Revision: 1214823
URL: http://svn.apache.org/viewvc?rev=1214823&view=rev
Log:
add some debug to see what happened on the windauze jenkins node
Added:
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml (with props)
Modified:
archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml?rev=1214823&r1=1214822&r2=1214823&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml Thu Dec 15 16:01:22 2011
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java?rev=1214823&r1=1214822&r2=1214823&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java (original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java Thu Dec 15 16:01:22 2011
@@ -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 ) );
Added: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml?rev=1214823&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml (added)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml Thu Dec 15 16:01:22 2011
@@ -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>
Propchange: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision