You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/08/01 20:53:19 UTC
[1/4] archiva git commit: Removing osgi dependencies
Repository: archiva
Updated Branches:
refs/heads/master f637c02c7 -> e5e11721b
Removing osgi dependencies
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/bba9d8b5
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/bba9d8b5
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/bba9d8b5
Branch: refs/heads/master
Commit: bba9d8b512d82391f7f0e7bf1ba3e8ae03bb9827
Parents: f637c02
Author: Martin Stockhammer <ma...@apache.org>
Authored: Wed Jul 19 22:36:17 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Wed Jul 19 22:36:17 2017 +0200
----------------------------------------------------------------------
archiva-modules/plugins/repository-statistics/pom.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/bba9d8b5/archiva-modules/plugins/repository-statistics/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml
index 8265ed1..acfea4f 100644
--- a/archiva-modules/plugins/repository-statistics/pom.xml
+++ b/archiva-modules/plugins/repository-statistics/pom.xml
@@ -79,9 +79,6 @@
org.apache.archiva.metadata.repository.stats;version=${project.version}
</Export-Package>
<Import-Package>
- javax.jcr,
- javax.jcr.query,
- org.apache.jackrabbit.commons;version="[2.3,3)",
org.apache.archiva.metadata.model;version=${project.version},
org.apache.archiva.metadata.repository;version=${project.version},
org.apache.archiva.metadata.repository.storage.maven2;version=${project.version},
[4/4] archiva git commit: Merge branch 'pr-30'
Posted by ma...@apache.org.
Merge branch 'pr-30'
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/e5e11721
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/e5e11721
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/e5e11721
Branch: refs/heads/master
Commit: e5e11721b14786153a9d9156b4dde4ba8b8ad2b3
Parents: bba9d8b da10799
Author: Martin Stockhammer <ma...@apache.org>
Authored: Tue Aug 1 22:39:34 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Tue Aug 1 22:39:34 2017 +0200
----------------------------------------------------------------------
.../DefaultArchivaConfiguration.java | 2 +-
.../repository/AbstractRepositoryPurgeTest.java | 2 +-
.../consumers/lucene/NexusIndexerConsumer.java | 2 +-
.../filelock/DefaultFileLockManagerTest.java | 20 ++++++++++----------
.../DefaultFileLockManagerTimeoutTest.java | 4 ++--
.../proxy/DefaultRepositoryProxyConnectors.java | 11 +++++------
.../repository/AbstractRepositoryAdminTest.java | 4 ++--
.../functors/ConsumerProcessFileClosure.java | 4 ++--
.../indexing/ArchivaIndexingTaskExecutor.java | 6 +++---
.../DefaultRepositoryArchivaTaskScheduler.java | 2 +-
.../rest/services/DefaultCommonServices.java | 2 +-
.../rest/services/DefaultPluginsServices.java | 2 +-
.../services/DefaultRepositoriesService.java | 18 +++++++++---------
.../web/api/DefaultFileUploadService.java | 4 ++--
.../ldap/ArchivaLdapConnectionFactory.java | 2 +-
.../ArchivaUserManagerAuthenticator.java | 2 +-
.../web/startup/SecuritySynchronization.java | 2 +-
.../archiva/webdav/ArchivaDavResource.java | 6 +++---
.../apache/archiva/webdav/util/MimeTypes.java | 4 ++--
.../archiva/audit/DefaultAuditManager.java | 2 +-
.../DefaultCassandraArchivaManager.java | 2 +-
.../repository/file/FileMetadataRepository.java | 2 +-
.../repository/jcr/JcrMetadataRepository.java | 4 ++--
.../DefaultRepositoryStatisticsManager.java | 2 +-
24 files changed, 55 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
[3/4] archiva git commit: Fix two incorrect SLF4J logger calls
Posted by ma...@apache.org.
Fix two incorrect SLF4J logger calls
These issues were found by SLF4J Helper for NetBeans IDE:
http://plugins.netbeans.org/plugin/72557/
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/da107994
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/da107994
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/da107994
Branch: refs/heads/master
Commit: da107994474d9fcb672501e3905cee6595ff0c6a
Parents: 0b15664
Author: Daniel Trebbien <dt...@gmail.com>
Authored: Sun Jul 30 13:29:29 2017 -0700
Committer: Daniel Trebbien <dt...@gmail.com>
Committed: Sun Jul 30 13:29:29 2017 -0700
----------------------------------------------------------------------
.../repository/DefaultRepositoryArchivaTaskScheduler.java | 2 +-
.../main/java/org/apache/archiva/webdav/ArchivaDavResource.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/da107994/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
index 672869b..18c775e 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
@@ -387,7 +387,7 @@ public class DefaultRepositoryArchivaTaskScheduler
catch ( RuntimeException e )
{
log.error(
- "ParseException in repository scanning cron expression, disabling repository scanning for '': {}",
+ "ParseException in repository scanning cron expression, disabling repository scanning for '{}': {}",
repoConfig.getId(), e.getMessage() );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/da107994/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
index 6a14e21..20bb2cb 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
@@ -522,7 +522,7 @@ public class ArchivaDavResource
triggerAuditEvent( remoteAddr, locator.getRepositoryId(), logicalResource, AuditEvent.COPY_FILE );
}
- log.debug( "{}{}' copied to '{}' (current user '{)')", ( isCollection() ? "Directory '" : "File '" ),
+ log.debug( "{}{}' copied to '{}' (current user '{}')", ( isCollection() ? "Directory '" : "File '" ),
getLocalResource().getName(), destination, this.principal );
}
[2/4] archiva git commit: Utilize parameterized logging and remove
toString() calls
Posted by ma...@apache.org.
Utilize parameterized logging and remove toString() calls
As suggested in the SLF4J FAQ:
https://www.slf4j.org/faq.html#logging_performance
.. parameterized logging can improve the efficiency of logger calls when
logging at the specified level is disabled.
In addition, per the FAQ: https://www.slf4j.org/faq.html#paramException
since SLF4J 1.6.0 it is possible to use parameterized logging and also
log an exception/throwable.
toString() is called automatically:
https://www.slf4j.org/faq.html#string_contents
These changes were suggested by SLF4J Helper for NetBeans IDE:
http://plugins.netbeans.org/plugin/72557/
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/0b15664f
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/0b15664f
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/0b15664f
Branch: refs/heads/master
Commit: 0b15664f1c667c6bab69d44ffa6f5cf966ae38cf
Parents: f637c02
Author: Daniel Trebbien <dt...@gmail.com>
Authored: Sun Jul 30 13:26:05 2017 -0700
Committer: Daniel Trebbien <dt...@gmail.com>
Committed: Sun Jul 30 13:26:05 2017 -0700
----------------------------------------------------------------------
.../DefaultArchivaConfiguration.java | 2 +-
.../repository/AbstractRepositoryPurgeTest.java | 2 +-
.../consumers/lucene/NexusIndexerConsumer.java | 2 +-
.../filelock/DefaultFileLockManagerTest.java | 20 ++++++++++----------
.../DefaultFileLockManagerTimeoutTest.java | 4 ++--
.../proxy/DefaultRepositoryProxyConnectors.java | 11 +++++------
.../repository/AbstractRepositoryAdminTest.java | 4 ++--
.../functors/ConsumerProcessFileClosure.java | 4 ++--
.../indexing/ArchivaIndexingTaskExecutor.java | 6 +++---
.../rest/services/DefaultCommonServices.java | 2 +-
.../rest/services/DefaultPluginsServices.java | 2 +-
.../services/DefaultRepositoriesService.java | 18 +++++++++---------
.../web/api/DefaultFileUploadService.java | 4 ++--
.../ldap/ArchivaLdapConnectionFactory.java | 2 +-
.../ArchivaUserManagerAuthenticator.java | 2 +-
.../web/startup/SecuritySynchronization.java | 2 +-
.../archiva/webdav/ArchivaDavResource.java | 4 ++--
.../apache/archiva/webdav/util/MimeTypes.java | 4 ++--
.../archiva/audit/DefaultAuditManager.java | 2 +-
.../DefaultCassandraArchivaManager.java | 2 +-
.../repository/file/FileMetadataRepository.java | 2 +-
.../repository/jcr/JcrMetadataRepository.java | 4 ++--
.../DefaultRepositoryStatisticsManager.java | 2 +-
23 files changed, 53 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
index 4547787..f8aea6e 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
@@ -703,7 +703,7 @@ public class DefaultArchivaConfiguration
}
catch ( IOException e )
{
- log.error( "Unable to create " + filetype + " file: " + e.getMessage(), e );
+ log.error( "Unable to create {} file: {}", filetype, e.getMessage(), e );
return false;
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
index 9412ac7..1a997ee 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
@@ -144,7 +144,7 @@ public abstract class AbstractRepositoryPurgeTest
if ( path.contains( " " ) )
{
LoggerFactory.getLogger( AbstractRepositoryPurgeTest.class.getName() ).error(
- "You are building and testing with a path: \n " + path + " containing space. Consider relocating." );
+ "You are building and testing with a path: \n {} containing space. Consider relocating.", path );
return path.replaceAll( " ", "&20" );
}
return path;
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
index aa999bd..66f067f 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
@@ -219,7 +219,7 @@ public class NexusIndexerConsumer
}
catch ( TaskQueueException e )
{
- log.error( "Error queueing task: " + task + ": " + e.getMessage(), e );
+ log.error( "Error queueing task: {}: {}", task, e.getMessage(), e );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTest.java b/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTest.java
index af189ba..adcdbc7 100644
--- a/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTest.java
+++ b/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTest.java
@@ -112,7 +112,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread1 ok");
success.incrementAndGet();
} catch (Throwable e) {
- logger.error("Error occured " + e.getMessage());
+ logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@@ -132,7 +132,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread2 ok");
success.incrementAndGet();
} catch (Throwable e) {
- logger.error("Error occured " + e.getMessage());
+ logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@@ -156,7 +156,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread3 ok");
success.incrementAndGet();
} catch (Throwable e) {
- logger.error("Error occured " + e.getMessage());
+ logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@@ -177,7 +177,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread4 ok");
success.incrementAndGet();
} catch (Throwable e) {
- logger.error("Error occured " + e.getMessage());
+ logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@@ -198,7 +198,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread5 ok");
success.incrementAndGet();
} catch (Throwable e) {
- logger.error("Error occured " + e.getMessage());
+ logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@@ -221,7 +221,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread6 ok");
success.incrementAndGet();
} catch (Throwable e) {
- logger.error("Error occured " + e.getMessage());
+ logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@@ -242,7 +242,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread7 ok");
success.incrementAndGet();
} catch (Throwable e) {
- logger.error("Error occured " + e.getMessage());
+ logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@@ -265,7 +265,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread8 ok");
success.incrementAndGet();
} catch (Throwable e) {
- logger.error("Error occured " + e.getMessage());
+ logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@@ -286,7 +286,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread9 ok");
success.incrementAndGet();
} catch (Throwable e) {
- logger.error("Error occured " + e.getMessage());
+ logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@@ -308,7 +308,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread10 ok");
success.incrementAndGet();
} catch (Throwable e) {
- logger.error("Error occured " + e.getMessage());
+ logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java b/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
index 666efee..514dfde 100644
--- a/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
+++ b/archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
@@ -76,14 +76,14 @@ public class DefaultFileLockManagerTimeoutTest
try {
Files.copy(largeJar.toPath(), lock.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch (IOException e) {
- logger.warn("Copy failed "+e.getMessage());
+ logger.warn("Copy failed {}", e.getMessage());
// On windows a FileSystemException is thrown
// We ignore this
}
lock = fileLockManager.writeFileLock(file);
} catch (FileSystemException ex) {
- logger.error("Exception from filesystem "+ex.getMessage());
+ logger.error("Exception from filesystem {}", ex.getMessage());
ex.printStackTrace();
throw ex;
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
index 5d60874..1397c7e 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
@@ -428,10 +428,9 @@ public class DefaultRepositoryProxyConnectors
"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: {}",
- e.getMessage(), e
- );
+ "Transfer error from repository \"{}"
+ + "\" for resource {}, continuing to next repository. Error message: {}",
+ targetRepository.getRepository().getId(), path, e.getMessage(), e );
}
catch ( RepositoryAdminException e )
{
@@ -830,8 +829,8 @@ public class DefaultRepositoryProxyConnectors
}
catch ( TaskQueueException e )
{
- log.error( "Unable to queue repository task to execute consumers on resource file ['" + localFile.getName()
- + "']." );
+ log.error( "Unable to queue repository task to execute consumers on resource file ['{}"
+ + "'].", localFile.getName() );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
index 96d217d..bfaa9c6 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
@@ -89,8 +89,8 @@ public abstract class AbstractRepositoryAdminTest
if ( path.contains( SPACE ) )
{
LoggerFactory.getLogger( AbstractRepositoryAdminTest.class.getName() ).error(
- "You are building and testing with {appserver.base}: \n " + path
- + " containing space. Consider relocating." );
+ "You are building and testing with {appserver.base}: \n {}"
+ + " containing space. Consider relocating.", path );
}
return path.replaceAll( SPACE, "&20" );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
index ca44dd9..85375bc 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
@@ -77,8 +77,8 @@ public class ConsumerProcessFileClosure
/* Intentionally Catch all exceptions.
* So that the discoverer processing can continue.
*/
- log.error( "Consumer [" + id + "] had an error when processing file ["
- + basefile.getAbsolutePath() + "]: " + e.getMessage(), e );
+ log.error( "Consumer [{}] had an error when processing file ["
+ + "{}]: {}", id, basefile.getAbsolutePath(), e.getMessage(), e );
}
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
index 71fb584..1509bef 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
@@ -135,7 +135,7 @@ public class ArchivaIndexingTaskExecutor
}
catch ( RepositoryAdminException e )
{
- log.error( "Error occurred while creating context: " + e.getMessage() );
+ log.error( "Error occurred while creating context: {}", e.getMessage() );
throw new TaskExecutionException( "Error occurred while creating context: " + e.getMessage(), e );
}
}
@@ -227,7 +227,7 @@ public class ArchivaIndexingTaskExecutor
}
catch ( IOException e )
{
- log.error( "Error occurred while executing indexing task '" + indexingTask + "': " + e.getMessage(),
+ log.error( "Error occurred while executing indexing task '{}': {}", indexingTask, e.getMessage(),
e );
throw new TaskExecutionException( "Error occurred while executing indexing task '" + indexingTask + "'",
e );
@@ -261,7 +261,7 @@ public class ArchivaIndexingTaskExecutor
}
catch ( IOException e )
{
- log.error( "Error occurred while executing indexing task '" + indexingTask + "': " + e.getMessage() );
+ log.error( "Error occurred while executing indexing task '{}': {}", indexingTask, e.getMessage() );
throw new TaskExecutionException( "Error occurred while executing indexing task '" + indexingTask + "'",
e );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
index b7cb60d..180cee7 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
@@ -83,7 +83,7 @@ public class DefaultCommonServices
}
catch ( IOException e )
{
- log.warn( "skip error loading properties {}", resourceName.toString() );
+ log.warn( "skip error loading properties {}", resourceName );
}
return fromProperties( properties );
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
index 208400c..d6f1908 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
@@ -72,7 +72,7 @@ public class DefaultPluginsServices
{
sb.append( repoType ).append( "|" );
}
- log.debug( "getAdminPlugins: {}", sb.toString() );
+ log.debug( "getAdminPlugins: {}", sb );
if ( sb.length() > 1 )
{
adminPlugins = sb.substring( 0, sb.length() - 1 );
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
index e0660c2..a5f6844 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
@@ -352,7 +352,7 @@ public class DefaultRepositoriesService
}
catch ( AuthorizationException e )
{
- log.error( "error reading permission: " + e.getMessage(), e );
+ log.error( "error reading permission: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
@@ -370,7 +370,7 @@ public class DefaultRepositoriesService
}
catch ( AuthorizationException e )
{
- log.error( "error reading permission: " + e.getMessage(), e );
+ log.error( "error reading permission: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
@@ -394,7 +394,7 @@ public class DefaultRepositoriesService
if ( StringUtils.isEmpty( artifactSourcePath ) )
{
- log.error( "cannot find artifact " + artifactTransferRequest.toString() );
+ log.error( "cannot find artifact {}", artifactTransferRequest );
throw new ArchivaRestServiceException( "cannot find artifact " + artifactTransferRequest.toString(),
null );
}
@@ -403,7 +403,7 @@ public class DefaultRepositoriesService
if ( !artifactFile.exists() )
{
- log.error( "cannot find artifact " + artifactTransferRequest.toString() );
+ log.error( "cannot find artifact {}", artifactTransferRequest );
throw new ArchivaRestServiceException( "cannot find artifact " + artifactTransferRequest.toString(),
null );
}
@@ -487,17 +487,17 @@ public class DefaultRepositoriesService
}
catch ( RepositoryException e )
{
- log.error( "RepositoryException: " + e.getMessage(), e );
+ log.error( "RepositoryException: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
catch ( RepositoryAdminException e )
{
- log.error( "RepositoryAdminException: " + e.getMessage(), e );
+ log.error( "RepositoryAdminException: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
catch ( IOException e )
{
- log.error( "IOException: " + e.getMessage(), e );
+ log.error( "IOException: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
return true;
@@ -517,8 +517,8 @@ public class DefaultRepositoriesService
}
catch ( TaskQueueException e )
{
- log.error( "Unable to queue repository task to execute consumers on resource file ['" + localFile.getName()
- + "']." );
+ log.error( "Unable to queue repository task to execute consumers on resource file ['{}"
+ + "'].", localFile.getName() );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
index e4d6676..af0164d 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
@@ -569,8 +569,8 @@ public class DefaultFileUploadService
}
catch ( TaskQueueException e )
{
- log.error( "Unable to queue repository task to execute consumers on resource file ['" + localFile.getName()
- + "']." );
+ log.error( "Unable to queue repository task to execute consumers on resource file ['{}"
+ + "'].", localFile.getName() );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
index 45945f1..55dad7b 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
@@ -73,7 +73,7 @@ public class ArchivaLdapConnectionFactory
}
catch ( InvalidNameException e )
{
- log.error("Error during initialization of LdapConnectionFactory "+e.getMessage(),e);
+ log.error( "Error during initialization of LdapConnectionFactory {}", e.getMessage(), e );
// throw new RuntimeException( "Error while initializing connection factory.", e );
}
catch ( RepositoryAdminException e )
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
index b1cbc9c..0acc266 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
@@ -89,7 +89,7 @@ public class ArchivaUserManagerAuthenticator
}
catch ( RepositoryAdminException e )
{
- log.error("Error during repository initialization "+e.getMessage(),e);
+ log.error( "Error during repository initialization {}", e.getMessage(), e );
// throw new AuthenticationException( e.getMessage(), e );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
index 0e28b51..4ddbbd9 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
@@ -152,7 +152,7 @@ public class SecuritySynchronization
catch ( RoleManagerException e )
{
// Log error.
- log.error( "Unable to create roles for configured repositories: " + e.getMessage(), e );
+ log.error( "Unable to create roles for configured repositories: {}", e.getMessage(), e );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
index 074d13b..6a14e21 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
@@ -723,8 +723,8 @@ public class ArchivaDavResource
}
catch ( TaskQueueException e )
{
- log.error( "Unable to queue repository task to execute consumers on resource file ['" + localFile.getName()
- + "']." );
+ log.error( "Unable to queue repository task to execute consumers on resource file ['{}"
+ + "'].", localFile.getName() );
}
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/MimeTypes.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/MimeTypes.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/MimeTypes.java
index 092c4b1..e42d634 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/MimeTypes.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/MimeTypes.java
@@ -100,7 +100,7 @@ public class MimeTypes
}
catch ( IOException e )
{
- log.error( "Unable to load mime map " + resourceName + " : " + e.getMessage(), e );
+ log.error( "Unable to load mime map {} : {}", resourceName, e.getMessage(), e );
}
}
@@ -146,7 +146,7 @@ public class MimeTypes
}
catch ( IOException e )
{
- log.error( "Unable to read mime types from input stream : " + e.getMessage(), e );
+ log.error( "Unable to read mime types from input stream : {}", e.getMessage(), e );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
index 4408618..510dc81 100644
--- a/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
+++ b/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
@@ -134,7 +134,7 @@ public class DefaultAuditManager
}
catch ( ParseException e )
{
- log.error( "Invalid audit event found in the metadata repository: " + e.getMessage() );
+ log.error( "Invalid audit event found in the metadata repository: {}", e.getMessage() );
// continue and ignore this one
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
index 44b0299..d0185d9 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
@@ -458,7 +458,7 @@ public class DefaultCassandraArchivaManager
{ // ensure keyspace exists, here if the keyspace doesn't exist we suppose nothing exist
if ( cluster.describeKeyspace( keyspaceName ) == null )
{
- logger.info( "Creating Archiva Cassandra '" + keyspaceName + "' keyspace." );
+ logger.info( "Creating Archiva Cassandra '{}' keyspace.", keyspaceName );
cluster.addKeyspace( HFactory.createKeyspaceDefinition( keyspaceName, //
ThriftKsDef.DEF_STRATEGY_CLASS, //
replicationFactor, //
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
index 2cea31c..7a3af1a 100644
--- a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
@@ -570,7 +570,7 @@ public class FileMetadataRepository
MetadataFacetFactory factory = metadataFacetFactories.get( facetId );
if ( factory == null )
{
- log.error( "Attempted to load unknown artifact metadata facet: " + facetId );
+ log.error( "Attempted to load unknown artifact metadata facet: {}", facetId );
}
else
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
index 2b76db4..f8393b8 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
@@ -1353,7 +1353,7 @@ public class JcrMetadataRepository
getJcrSession().save();
} catch ( InvalidItemStateException e ) {
// olamy this might happen when deleting a repo while is under scanning
- log.warn( "skip InvalidItemStateException:" + e.getMessage(), e );
+ log.warn( "skip InvalidItemStateException:{}", e.getMessage(), e );
}
catch ( RepositoryException e )
{
@@ -1493,7 +1493,7 @@ public class JcrMetadataRepository
MetadataFacetFactory factory = metadataFacetFactories.get( name );
if ( factory == null )
{
- log.error( "Attempted to load unknown project version metadata facet: " + name );
+ log.error( "Attempted to load unknown project version metadata facet: {}", name );
}
else
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/0b15664f/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
index f7c4dcc..9611bbb 100644
--- a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
+++ b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
@@ -156,7 +156,7 @@ public class DefaultRepositoryStatisticsManager
}
catch ( ParseException e )
{
- log.error( "Invalid scan result found in the metadata repository: " + e.getMessage() );
+ log.error( "Invalid scan result found in the metadata repository: {}", e.getMessage() );
// continue and ignore this one
}
}