From: Olivier Lamy <olamy@apache.org>
Date: Mon, 19 Mar 2012 12:04:17 +0000 (+0000)
Subject: fix more empty data
X-Git-Tag: archiva-1.4-M3~1003
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3592d26fadc53182864bb11c5c8d767ef528c944;p=archiva.git

fix more empty data

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1302390 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
index afb9ae5b7..00bc52897 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
@@ -436,27 +436,27 @@ public class DefaultBrowseService
                         && !StringUtils.equalsIgnoreCase( sharedModel.getIssueManagement().getUrl(),
                                                           versionMetadata.getIssueManagement().getUrl() ) )
                     {
-                        sharedModel.setIssueManagement( null );
+                        sharedModel.setIssueManagement( versionMetadata.getIssueManagement() );
                     }
 
                     if ( sharedModel.getCiManagement() != null && versionMetadata.getCiManagement() != null
                         && !StringUtils.equalsIgnoreCase( sharedModel.getCiManagement().getUrl(),
                                                           versionMetadata.getCiManagement().getUrl() ) )
                     {
-                        sharedModel.setCiManagement( null );
+                        sharedModel.setCiManagement( versionMetadata.getCiManagement() );
                     }
 
                     if ( sharedModel.getOrganization() != null && versionMetadata.getOrganization() != null
                         && !StringUtils.equalsIgnoreCase( sharedModel.getOrganization().getName(),
                                                           versionMetadata.getOrganization().getName() ) )
                     {
-                        sharedModel.setOrganization( null );
+                        sharedModel.setOrganization( versionMetadata.getOrganization() );
                     }
 
                     if ( sharedModel.getUrl() != null && !StringUtils.equalsIgnoreCase( sharedModel.getUrl(),
                                                                                         versionMetadata.getUrl() ) )
                     {
-                        sharedModel.setUrl( null );
+                        sharedModel.setUrl( versionMetadata.getUrl() );
                     }
                 }
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml
new file mode 100644
index 000000000..8451b6263
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml
@@ -0,0 +1,56 @@
+<?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.cxf.jaxrs.interceptor.JAXRSInInterceptor">
+    <level value="trace"/>
+  </logger>
+  <logger name="org.apache.cxf.jaxrs.utils.JAXRSUtils">
+    <level value="trace"/>
+  </logger>
+  -->
+
+
+  <logger name="org.codehaus.redback.rest.services" >
+    <level value="ERROR"/>
+  </logger>
+  <logger name="JPOX">
+    <level value="ERROR"/>
+  </logger>
+
+  <logger name="org.springframework">
+    <level value="ERROR"/>
+  </logger>
+
+  <root>
+    <priority value ="info" />
+    <appender-ref ref="console" />
+  </root>
+
+</log4j:configuration>