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 2013/12/02 05:07:18 UTC
svn commit: r1546890 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/
archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/
archiva-base/archiva-configuration/src...
Author: olamy
Date: Mon Dec 2 04:07:17 2013
New Revision: 1546890
URL: http://svn.apache.org/r1546890
Log:
fix logging warn level
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/Banner.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java Mon Dec 2 04:07:17 2013
@@ -175,7 +175,7 @@ public class ChecksummedFile
}
catch ( IOException e )
{
- log.warn( "Unable to update checksum:" + e.getMessage() );
+ log.warn( "Unable to update checksum:{}", e.getMessage() );
return false;
}
@@ -200,7 +200,7 @@ public class ChecksummedFile
}
catch ( IOException e )
{
- log.warn( "Unable to read / parse checksum: " + e.getMessage() );
+ log.warn( "Unable to read / parse checksum: {}", e.getMessage() );
return false;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java Mon Dec 2 04:07:17 2013
@@ -336,7 +336,7 @@ public class DefaultArchivaConfiguration
else
{
// Policy key doesn't exist. Don't add it to golden version.
- log.warn( "Policy [" + policyId + "] does not exist." );
+ log.warn( "Policy [{}] does not exist.", policyId );
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java Mon Dec 2 04:07:17 2013
@@ -568,7 +568,7 @@ public class ArchivaConfigurationTest
assertEquals( "check managed repositories", "default", repository.getLayout() );
assertTrue( "check managed repositories", repository.isScanned() );
- log.info( "knowContentConsumers " + configuration.getRepositoryScanning().getKnownContentConsumers() );
+ log.info( "knowContentConsumers {}", configuration.getRepositoryScanning().getKnownContentConsumers() );
assertFalse(
configuration.getRepositoryScanning().getKnownContentConsumers().contains( "update-db-artifact" ) );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java Mon Dec 2 04:07:17 2013
@@ -206,15 +206,15 @@ public class ArchivaMetadataCreationCons
catch ( MetadataRepositoryException e )
{
log.warn(
- "Error occurred persisting metadata for artifact:{} (repository:{}); message: {}" + e.getMessage(),
- new Object[]{ path, repoId, e.getMessage() }, e );
+ "Error occurred persisting metadata for artifact:{} (repository:{}); message: {}" ,
+ path, repoId, e.getMessage(), e );
repositorySession.revert();
}
catch ( RepositoryStorageRuntimeException e )
{
log.warn(
- "Error occurred persisting metadata for artifact:{} (repository:{}); message: {}" + e.getMessage(),
- new Object[]{ path, repoId, e.getMessage() }, e );
+ "Error occurred persisting metadata for artifact:{} (repository:{}); message: {}",
+ path, repoId, e.getMessage(), e );
repositorySession.revert();
}
finally
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java Mon Dec 2 04:07:17 2013
@@ -134,11 +134,11 @@ public class LegacyConverterArtifactCons
}
catch ( LayoutException e )
{
- log.warn( "Unable to convert artifact: " + path + " : " + e.getMessage(), e );
+ log.warn( "Unable to convert artifact: {} : {}",path , e.getMessage(), e );
}
catch ( ArtifactConversionException e )
{
- log.warn( "Unable to convert artifact: " + path + " : " + e.getMessage(), e );
+ log.warn( "Unable to convert artifact: {} : {}",path , e.getMessage(), e );
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java Mon Dec 2 04:07:17 2013
@@ -828,7 +828,7 @@ public class MavenRepositorySearchTest
archivaConfigControl.verify();
- log.info( "groupIds: " + groupIds );
+ log.info( "groupIds: {}", groupIds );
assertEquals( 3, groupIds.size() );
assertTrue( groupIds.contains( "com" ) );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java Mon Dec 2 04:07:17 2013
@@ -110,7 +110,7 @@ public class DefaultWagonFactory
}
catch ( Exception e )
{
- logger.warn( "fail to configure User-Agent: " + e.getMessage(), e );
+ logger.warn( "fail to configure User-Agent: {}", e.getMessage(), e );
}
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java Mon Dec 2 04:07:17 2013
@@ -268,11 +268,11 @@ public class DefaultRepositoryProxyConne
}
catch ( RepositoryNotFoundException e )
{
- log.warn( "Unable to use proxy connector: " + e.getMessage(), e );
+ log.warn( "Unable to use proxy connector: {}", e.getMessage(), e );
}
catch ( RepositoryException e )
{
- log.warn( "Unable to use proxy connector: " + e.getMessage(), e );
+ log.warn( "Unable to use proxy connector: {}", e.getMessage(), e );
}
@@ -447,8 +447,8 @@ public class DefaultRepositoryProxyConne
catch ( ProxyException e )
{
log.warn(
- "Transfer error from repository \"" + targetRepository.getRepository().getId() + "\" for resource "
- + path + ", continuing to next repository. Error message: {}", e.getMessage() );
+ "Transfer error from repository {} for resource {}, continuing to next repository. Error message: {}",
+ targetRepository.getRepository().getId(), path, e.getMessage() );
log.debug( MarkerFactory.getDetachedMarker( "transfer.error" ),
"Transfer error from repository \"" + targetRepository.getRepository().getId()
+ "\" for resource " + path + ", continuing to next repository. Error message: {}",
@@ -457,8 +457,7 @@ public class DefaultRepositoryProxyConne
catch ( RepositoryAdminException e )
{
log.debug( MarkerFactory.getDetachedMarker( "transfer.error" ),
- "Transfer error from repository \"" + targetRepository.getRepository().getId()
- + "\" for resource " + path + ", continuing to next repository. Error message: {}",
+ "Transfer error from repository {} for resource {}, continuing to next repository. Error message: {}",targetRepository.getRepository().getId(), path,
e.getMessage(), e );
log.debug( MarkerFactory.getDetachedMarker( "transfer.error" ), "Full stack trace", e );
}
@@ -517,16 +516,14 @@ public class DefaultRepositoryProxyConne
}
catch ( ProxyException e )
{
- log.warn( "Transfer error from repository \"" + targetRepository.getRepository().getId()
- + "\" for versioned Metadata " + logicalPath
- + ", continuing to next repository. Error message: " + e.getMessage() );
+ log.warn( "Transfer error from repository {} for versioned Metadata {}, continuing to next repository. Error message: {}",
+ targetRepository.getRepository().getId(), logicalPath, e.getMessage() );
log.debug( "Full stack trace", e );
}
catch ( RepositoryAdminException e )
{
- log.warn( "Transfer error from repository \"" + targetRepository.getRepository().getId()
- + "\" for versioned Metadata " + logicalPath
- + ", continuing to next repository. Error message: " + e.getMessage() );
+ log.warn( "Transfer error from repository {} for versioned Metadata {}, continuing to next repository. Error message: {}",
+ targetRepository.getRepository().getId(), logicalPath, e.getMessage() );
log.debug( "Full stack trace", e );
}
}
@@ -544,7 +541,7 @@ public class DefaultRepositoryProxyConne
}
catch ( RepositoryMetadataException e )
{
- log.warn( "Unable to update metadata " + localFile.getAbsolutePath() + ": " + e.getMessage(), e );
+ log.warn( "Unable to update metadata {}:{}", localFile.getAbsolutePath(), e.getMessage(), e );
}
}
@@ -928,7 +925,7 @@ public class DefaultRepositoryProxyConne
catch ( ProxyException e )
{
urlFailureCache.cacheFailure( url );
- log.warn( "Transfer failed on checksum: " + url + " : " + e.getMessage(), e );
+ log.warn( "Transfer failed on checksum: {} : {}",url ,e.getMessage(), e );
// Critical issue, pass it on.
throw e;
}
@@ -1088,8 +1085,8 @@ public class DefaultRepositoryProxyConne
}
log.warn(
- "Transfer error from repository \"" + content.getRepository().getId() + "\" for artifact " + Keys.toKey(
- artifact ) + ", continuing to next repository. Error message: " + exception.getMessage() );
+ "Transfer error from repository {} for artifact {} , continuing to next repository. Error message: {}",
+ content.getRepository().getId(), Keys.toKey( artifact), exception.getMessage() );
log.debug( "Full stack trace", exception );
}
@@ -1214,12 +1211,12 @@ public class DefaultRepositoryProxyConne
}
catch ( ConnectionException e )
{
- log.warn( "Could not connect to " + remoteRepository.getRepository().getName() + ": " + e.getMessage() );
+ log.warn( "Could not connect to {}: {}", remoteRepository.getRepository().getName(), e.getMessage() );
connected = false;
}
catch ( AuthenticationException e )
{
- log.warn( "Could not connect to " + remoteRepository.getRepository().getName() + ": " + e.getMessage() );
+ log.warn( "Could not connect to {}: {}", remoteRepository.getRepository().getName(), e.getMessage() );
connected = false;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java Mon Dec 2 04:07:17 2013
@@ -213,7 +213,7 @@ public abstract class AbstractProxyTestC
CacheManager.getInstance().clearAll();
- log.info( "\n.\\ " + name + "() \\._________________________________________\n" );
+ log.info( "\n.\\ {}() \\._________________________________________\n", name );
}
@After
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java Mon Dec 2 04:07:17 2013
@@ -65,7 +65,7 @@ public class WagonDelegate
public boolean getIfNewer( String resourceName, File destination, long timestamp )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
- log.info( ".getIfNewer(" + resourceName + ", " + destination + ", " + timestamp + ")" );
+ log.info( ".getIfNewer({}, {}, {})", resourceName, destination, timestamp );
boolean result = delegate.getIfNewer( resourceName, destination, timestamp );
createIfMissing( destination );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java Mon Dec 2 04:07:17 2013
@@ -389,7 +389,7 @@ public class DefaultManagedRepositoryAdm
catch ( MetadataRepositoryException e )
{
//throw new RepositoryAdminException( e.getMessage(), e );
- log.warn( "skip error during removing repository from MetadatRepository:" + e.getMessage(), e );
+ log.warn( "skip error during removing repository from MetadatRepository:{}", e.getMessage(), e );
}
finally
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java Mon Dec 2 04:07:17 2013
@@ -48,7 +48,7 @@ public class ManagedRepositoryAdminTest
List<ManagedRepository> repos = managedRepositoryAdmin.getManagedRepositories();
assertNotNull( repos );
assertTrue( repos.size() > 0 );
- log.info( "repos " + repos );
+ log.info( "repos {}", repos );
// check default internal
ManagedRepository internal = findManagedRepoById( repos, "internal" );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java Mon Dec 2 04:07:17 2013
@@ -39,7 +39,7 @@ public class RemoteRepositoryAdminTest
List<RemoteRepository> remoteRepositories = remoteRepositoryAdmin.getRemoteRepositories();
assertNotNull( remoteRepositories );
assertTrue( remoteRepositories.size() > 0 );
- log.info( "remote " + remoteRepositories );
+ log.info( "remote {}", remoteRepositories );
}
@Test
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java Mon Dec 2 04:07:17 2013
@@ -376,7 +376,7 @@ public class MetadataTools
{
// TODO: [monitor] consider a monitor for this event.
// TODO: consider a read-redo on monitor return code?
- log.warn( "Unable to read metadata: " + metadataFile.getAbsolutePath(), e );
+ log.warn( "Unable to read metadata: {}", metadataFile.getAbsolutePath(), e );
return null;
}
}
@@ -401,7 +401,7 @@ public class MetadataTools
{
// TODO: [monitor] consider a monitor for this event.
// TODO: consider a read-redo on monitor return code?
- log.warn( "Unable to read metadata: " + metadataFile.getAbsolutePath(), e );
+ log.warn( "Unable to read metadata: {}", metadataFile.getAbsolutePath(), e );
return null;
}
}
@@ -426,7 +426,7 @@ public class MetadataTools
{
// TODO: [monitor] consider a monitor for this event.
// TODO: consider a read-redo on monitor return code?
- log.warn( "Unable to read metadata: " + metadataFile.getAbsolutePath(), e );
+ log.warn( "Unable to read metadata: {}", metadataFile.getAbsolutePath(), e );
return null;
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java Mon Dec 2 04:07:17 2013
@@ -73,7 +73,7 @@ public class TriggerBeginScanClosure
}
catch ( ConsumerException e )
{
- log.warn( "Consumer [" + consumer.getId() + "] cannot begin: " + e.getMessage(), e );
+ log.warn( "Consumer [{}] cannot begin: {}",consumer.getId(), e.getMessage(), e );
}
}
}
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java Mon Dec 2 04:07:17 2013
@@ -205,7 +205,7 @@ public class DefaultDownloadRemoteIndexS
}
catch ( IllegalArgumentException e )
{
- log.warn( "Unable to schedule remote index download: " + e.getLocalizedMessage() );
+ log.warn( "Unable to schedule remote index download: {}", e.getLocalizedMessage() );
}
if ( remoteRepository.isDownloadRemoteIndexOnStartup() )
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java Mon Dec 2 04:07:17 2013
@@ -229,7 +229,7 @@ public class DownloadRemoteIndexTask
deleteDirectoryQuiet( tempIndexDirectory );
this.runningRemoteDownloadIds.remove( this.remoteRepository.getId() );
}
- log.info( "end download remote index for remote repository " + this.remoteRepository.getId() );
+ log.info( "end download remote index for remote repository {}", this.remoteRepository.getId() );
}
private void deleteDirectoryQuiet( File f )
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java Mon Dec 2 04:07:17 2013
@@ -88,7 +88,7 @@ public class DownloadRemoteIndexTaskTest
this.server.start();
Connector connector = this.server.getConnectors()[0];
this.port = connector.getLocalPort();
- log.info( "start server on port " + this.port );
+ log.info( "start server on port {}", this.port );
nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class );
}
@@ -140,7 +140,7 @@ public class DownloadRemoteIndexTaskTest
FlatSearchResponse response = nexusIndexer.searchFlat( rq );
- log.info( "returned hit count:" + response.getReturnedHitsCount() );
+ log.info( "returned hit count:{}", response.getReturnedHitsCount() );
assertEquals( 8, response.getReturnedHitsCount() );
}
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=1546890&r1=1546889&r2=1546890&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 Dec 2 04:07:17 2013
@@ -281,8 +281,8 @@ public class DefaultBrowseService
catch ( MetadataResolutionException e )
{
log.warn(
- "Skipping invalid metadata while compiling shared model for " + groupId + ":" + artifactId
- + " in repo " + repoId + ": " + e.getMessage() );
+ "Skipping invalid metadata while compiling shared model for {}:{} in repo {}: {}",
+ groupId, artifactId, repoId, e.getMessage() );
}
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.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/DefaultManagedRepositoriesService.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java Mon Dec 2 04:07:17 2013
@@ -165,7 +165,7 @@ public class DefaultManagedRepositoriesS
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Error retrieving repository statistics: " + e.getMessage(), e );
+ log.warn( "Error retrieving repository statistics: {}", e.getMessage(), e );
}
if ( stats != null )
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.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/DefaultReportRepositoriesService.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultReportRepositoriesService.java Mon Dec 2 04:07:17 2013
@@ -82,7 +82,7 @@ public class DefaultReportRepositoriesSe
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to retrieve stats, assuming is empty: " + e.getMessage(), e );
+ log.warn( "Unable to retrieve stats, assuming is empty: {}", e.getMessage(), e );
}
}
@@ -109,7 +109,7 @@ public class DefaultReportRepositoriesSe
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to retrieve stats, assuming is empty: " + e.getMessage(), e );
+ log.warn( "Unable to retrieve stats, assuming is empty: {}", e.getMessage(), e );
}
if ( stats == null || stats.isEmpty() )
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ManagedRepositoriesServiceTest.java Mon Dec 2 04:07:17 2013
@@ -160,7 +160,7 @@ public class ManagedRepositoriesServiceT
assertNotNull( archivaRepositoryStatistics );
- log.info( "archivaRepositoryStatistics:" + archivaRepositoryStatistics.toString() );
+ log.info( "archivaRepositoryStatistics: {}", archivaRepositoryStatistics.toString() );
assertEquals( 92, archivaRepositoryStatistics.getNewFileCount() );
assertEquals( 92, archivaRepositoryStatistics.getTotalFileCount() );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java Mon Dec 2 04:07:17 2013
@@ -130,7 +130,7 @@ public class SearchServiceTest
for ( Artifact artifact : artifacts )
{
- log.info( "url:" + artifact.getUrl() );
+ log.info( "url: {}", artifact.getUrl() );
String version = artifact.getVersion();
assertTrue( artifact.getUrl().contains( version ) );
@@ -231,7 +231,7 @@ public class SearchServiceTest
for ( Artifact artifact : artifacts )
{
- log.info( "url:" + artifact.getUrl() );
+ log.info( "url: {}", artifact.getUrl() );
String version = artifact.getVersion();
assertEquals( "http://localhost:" + port
+ "/repository/test-repo/org/apache/karaf/features/org.apache.karaf.features.core/"
@@ -269,7 +269,7 @@ public class SearchServiceTest
assertTrue( " not 1 results for Bundle ExportPackage org.apache.karaf.features.command.completers but "
+ artifacts.size() + ":" + artifacts, artifacts.size() == 1 );
- log.info( "artifact url " + artifacts.get( 0 ).getUrl() );
+ log.info( "artifact url {}", artifacts.get( 0 ).getUrl() );
deleteTestRepo( testRepoId );
}
@@ -333,7 +333,7 @@ public class SearchServiceTest
assertTrue( " not 0 results for Bundle ExportPackage org.apache.karaf.features.command.completers but "
+ artifacts.size() + ":" + artifacts, artifacts.size() == 1 );
- log.info( "artifact url " + artifacts.get( 0 ).getUrl() );
+ log.info( "artifact url {}", artifacts.get( 0 ).getUrl() );
deleteTestRepo( testRepoId );
}
@@ -354,7 +354,7 @@ public class SearchServiceTest
SearchService searchService = getSearchService( authorizationHeader );
Collection<String> groupIds = searchService.getAllGroupIds( Arrays.asList( testRepoId ) ).getGroupIds();
- log.info( "groupIds " + groupIds );
+ log.info( "groupIds {}", groupIds );
assertFalse( groupIds.isEmpty() );
assertTrue( groupIds.contains( "commons-cli" ) );
assertTrue( groupIds.contains( "org.apache.felix" ) );
@@ -384,7 +384,7 @@ public class SearchServiceTest
new SearchRequest( "org.foo", "studio-all-update-site", null, null, null, Arrays.asList( "test-repo" ) );
List<Artifact> artifacts = searchService.searchArtifacts( searchRequest );
- log.info( "artifacts:" + artifacts );
+ log.info( "artifacts: {}", artifacts );
assertEquals( 1, artifacts.size() );
deleteTestRepo( testRepoId );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaServletAuthenticator.java Mon Dec 2 04:07:17 2013
@@ -77,8 +77,8 @@ public class ArchivaServletAuthenticator
{
if ( authzResult.getException() != null )
{
- log.info( "Authorization Denied [ip=" + request.getRemoteAddr() + ",permission=" + permission + ",repo="
- + repositoryId + "] : " + authzResult.getException().getMessage() );
+ log.info( "Authorization Denied [ip={},permission={},repo={}] : {}", request.getRemoteAddr(),
+ permission, repositoryId, authzResult.getException().getMessage() );
throw new UnauthorizedException( "Access denied for repository " + repositoryId );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java Mon Dec 2 04:07:17 2013
@@ -263,7 +263,7 @@ public class RssFeedServlet
}
catch ( DecoderException ie )
{
- log.warn( "Error decoding username and password.", ie.getMessage() );
+ log.warn( "Error decoding username and password: {}", ie.getMessage() );
}
if ( usernamePassword == null || usernamePassword.trim().equals( "" ) )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java Mon Dec 2 04:07:17 2013
@@ -134,7 +134,7 @@ public class ArchivaLockedAdminEnvironme
}
catch ( RbacManagerException e )
{
- log.warn( "Exception when checking for locked admin user: " + e.getMessage(), e );
+ log.warn( "Exception when checking for locked admin user: {}", e.getMessage(), e );
}
checked = true;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/Banner.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/Banner.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/Banner.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/Banner.java Mon Dec 2 04:07:17 2013
@@ -224,6 +224,6 @@ public class Banner
public static void display( String version )
{
String banner = getBanner( version );
- LoggerFactory.getLogger( Banner.class ).info( StringUtils.repeat( "_", 25 ) + eol + banner );
+ LoggerFactory.getLogger( Banner.class ).info( "{} {}, {}" , StringUtils.repeat( "_", 25 ), eol, banner );
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java Mon Dec 2 04:07:17 2013
@@ -188,7 +188,7 @@ public class SecuritySynchronization
EnvironmentCheck check = entry.getValue();
List<String> v = new ArrayList<String>();
check.validateEnvironment( v );
- log.info( "Environment Check: " + entry.getKey() + " -> " + v.size() + " violation(s)" );
+ log.info( "Environment Check: {} -> {} violation(s)", entry.getKey(), v.size() );
for ( String s : v )
{
violations.add( "[" + entry.getKey() + "] " + s );
@@ -247,8 +247,7 @@ public class SecuritySynchronization
}
catch ( RbacManagerException e )
{
- log.warn( "Unable to add role [" + ArchivaRoleConstants.toRepositoryObserverRoleName( repoId ) + "] to "
- + principal + " user.", e );
+ log.warn( "Unable to add role [{}] to {} user.", ArchivaRoleConstants.toRepositoryObserverRoleName( repoId ), principal, e );
}
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java Mon Dec 2 04:07:17 2013
@@ -128,7 +128,7 @@ public abstract class AbstractDownloadTe
this.server.start();
Connector connector = this.server.getConnectors()[0];
this.port = connector.getLocalPort();
- log.info( "start server on port " + this.port );
+ log.info( "start server on port {}", this.port );
User user = new User();
user.setEmail( "toto@toto.fr" );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java Mon Dec 2 04:07:17 2013
@@ -197,7 +197,7 @@ public class DownloadArtifactsTest
}
catch ( Throwable e )
{
- log.info( "fail to get zipEntries " + e.getMessage(), e );
+ log.info( "fail to get zipEntries {}", e.getMessage(), e );
}
return Collections.emptyList();
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java Mon Dec 2 04:07:17 2013
@@ -629,7 +629,7 @@ public class ArchivaDavResourceFactory
}
catch ( LayoutException e )
{
- log.warn( "Artifact path '" + resourcePath + "' is invalid." );
+ log.warn( "Artifact path '{}' is invalid." ,resourcePath );
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java Mon Dec 2 04:07:17 2013
@@ -150,7 +150,7 @@ public abstract class AbstractRepository
int port = repo.server.getConnectors()[0].getLocalPort();
repo.url = "http://localhost:" + port + repo.context;
- log.info( "Remote HTTP Server started on " + repo.url );
+ log.info( "Remote HTTP Server started on {}", repo.url );
repo.config = createRemoteRepository( repo.id, "Testable [" + repo.id + "] Remote Repo", repo.url );
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java (original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java Mon Dec 2 04:07:17 2013
@@ -126,7 +126,7 @@ public class DefaultMetadataResolver
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to persist resolved information: " + e.getMessage(), e );
+ log.warn( "Unable to persist resolved information: {}", e.getMessage(), e );
}
session.markDirty();
@@ -193,7 +193,7 @@ public class DefaultMetadataResolver
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to persist resolved information: " + e.getMessage(), e );
+ log.warn( "Unable to persist resolved information: {}", e.getMessage(), e );
}
}
session.markDirty();
@@ -233,7 +233,7 @@ public class DefaultMetadataResolver
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to persist resolved information: " + e.getMessage(), e );
+ log.warn( "Unable to persist resolved information: {}", e.getMessage(), e );
}
}
session.markDirty();
@@ -276,7 +276,7 @@ public class DefaultMetadataResolver
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to persist resolved information: " + e.getMessage(), e );
+ log.warn( "Unable to persist resolved information: {}", e.getMessage(), e );
}
}
}
@@ -327,13 +327,13 @@ public class DefaultMetadataResolver
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to persist resolved information: " + e.getMessage(), e );
+ log.warn( "Unable to persist resolved information: {}", e.getMessage(), e );
}
catch ( RepositoryStorageMetadataInvalidException e )
{
log.warn(
- "Not update project in metadata repository due to an error resolving it from storage: "
- + e.getMessage() );
+ "Not update project in metadata repository due to an error resolving it from storage: {}",
+ e.getMessage() );
for ( RepositoryListener listener : listeners )
{
@@ -391,7 +391,7 @@ public class DefaultMetadataResolver
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to persist resolved information: " + e.getMessage(), e );
+ log.warn( "Unable to persist resolved information: {}", e.getMessage(), e );
}
}
session.markDirty();
Modified: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java (original)
+++ archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java Mon Dec 2 04:07:17 2013
@@ -64,7 +64,7 @@ public class MetadataAuditListener
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to write audit event to repository: " + e.getMessage(), e );
+ log.warn( "Unable to write audit event to repository: {}", e.getMessage(), e );
}
finally
{
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java Mon Dec 2 04:07:17 2013
@@ -211,7 +211,7 @@ public class Maven2RepositoryStorage
catch ( XMLException e )
{
// unable to parse metadata - log it, and continue with the version as the original SNAPSHOT version
- log.warn( "Invalid metadata: " + metadataFile + " - " + e.getMessage() );
+ log.warn( "Invalid metadata: {} - {}", metadataFile, e.getMessage() );
}
}
@@ -290,8 +290,8 @@ public class Maven2RepositoryStorage
if ( ( problem.getException() instanceof FileNotFoundException && e.getModelId() != null &&
!e.getModelId().equals( problem.getModelId() ) ) )
{
- log.warn( "The artifact's parent POM file '" + file + "' cannot be resolved. " +
- "Using defaults for project version metadata.." );
+ log.warn( "The artifact's parent POM file '{}' cannot be resolved. " +
+ "Using defaults for project version metadata..", file );
ProjectVersionMetadata metadata = new ProjectVersionMetadata();
metadata.setId( readMetadataRequest.getProjectVersion() );
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java Mon Dec 2 04:07:17 2013
@@ -142,13 +142,13 @@ public class RepositoryModelResolver
{
log.info(
"An exception was caught while attempting to retrieve model '{}' from remote repository '{}'.Reason:{}",
- new Object[]{ model.getAbsolutePath(), remoteRepository.getId(), e.getMessage() } );
+ model.getAbsolutePath(), remoteRepository.getId(), e.getMessage() );
}
catch ( Exception e )
{
log.warn(
"An exception was caught while attempting to retrieve model '{}' from remote repository '{}'.Reason:{}",
- new Object[]{ model.getAbsolutePath(), remoteRepository.getId(), e.getMessage() } );
+ model.getAbsolutePath(), remoteRepository.getId(), e.getMessage() );
continue;
}
Modified: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java (original)
+++ archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java Mon Dec 2 04:07:17 2013
@@ -51,7 +51,7 @@ public class RepositoryProblemEventListe
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to remove metadata facet as part of delete event: " + e.getMessage(), e );
+ log.warn( "Unable to remove metadata facet as part of delete event: {}", e.getMessage(), e );
}
}
@@ -69,8 +69,8 @@ public class RepositoryProblemEventListe
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to remove repository problem facets for the version being corrected in the repository: "
- + e.getMessage(), e );
+ log.warn( "Unable to remove repository problem facets for the version being corrected in the repository: {}",
+ e.getMessage(), e );
}
}
@@ -92,7 +92,7 @@ public class RepositoryProblemEventListe
}
catch ( MetadataRepositoryException e )
{
- log.warn( "Unable to add repository problem facets for the version being removed: " + e.getMessage(), e );
+ log.warn( "Unable to add repository problem facets for the version being removed: {}", e.getMessage(), e );
}
}
Modified: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java?rev=1546890&r1=1546889&r2=1546890&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java (original)
+++ archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java Mon Dec 2 04:07:17 2013
@@ -178,7 +178,7 @@ public class DuplicateArtifactsConsumer
}
catch ( Exception e )
{
- log.warn( "Not reporting problem for invalid artifact in checksum check: " + e.getMessage() );
+ log.warn( "Not reporting problem for invalid artifact in checksum check: {}", e.getMessage() );
return;
}