Author: olamy
Date: Mon Mar 19 12:04:17 2012
New Revision: 1302390
URL: http://svn.apache.org/viewvc?rev=1302390&view=rev
Log:
fix more empty data
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1302390&r1=1302389&r2=1302390&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
Mon Mar 19 12:04:17 2012
@@ -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() );
}
}
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml?rev=1302390&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml
Mon Mar 19 12:04:17 2012
@@ -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>
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
