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 2014/11/27 06:00:38 UTC
archiva git commit: format and debug infos
Repository: archiva
Updated Branches:
refs/heads/master c5e256751 -> d9473241c
format and debug infos
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/d9473241
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/d9473241
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/d9473241
Branch: refs/heads/master
Commit: d9473241c956359325aa10bdbff4e39be284c559
Parents: c5e2567
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Nov 27 15:32:24 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Nov 27 15:32:24 2014 +1100
----------------------------------------------------------------------
.../DefaultArchivaConfiguration.java | 24 ++++++++++----------
...DefaultRedbackRuntimeConfigurationAdmin.java | 2 +-
.../rest/services/AbstractRestService.java | 2 +-
...faultRedbackRuntimeConfigurationService.java | 8 ++++++-
4 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9473241/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 c6cc953..665c80a 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
@@ -89,7 +89,7 @@ import java.util.Set;
* before reading it from the registry.
* </p>
*/
-@Service( "archivaConfiguration#default" )
+@Service("archivaConfiguration#default")
public class DefaultArchivaConfiguration
implements ArchivaConfiguration, RegistryListener
{
@@ -99,7 +99,7 @@ public class DefaultArchivaConfiguration
* Plexus registry to read the configuration from.
*/
@Inject
- @Named( value = "commons-configuration" )
+ @Named(value = "commons-configuration")
private Registry registry;
@Inject
@@ -183,7 +183,7 @@ public class DefaultArchivaConfiguration
return configuration;
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
private Configuration load()
{
// TODO: should this be the same as section? make sure unnamed sections still work (eg, sys properties)
@@ -439,7 +439,7 @@ public class DefaultArchivaConfiguration
return registry.getSubset( KEY );
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
@Override
public synchronized void save( Configuration configuration )
throws IndeterminateConfigurationException, RegistryException
@@ -464,10 +464,13 @@ public class DefaultArchivaConfiguration
// a little aggressive with the repositoryScanning and databaseScanning - should be no need to split
// that configuration
- if ( key.startsWith( "repositories" ) || key.startsWith( "proxyConnectors" ) || key.startsWith(
- "networkProxies" ) || key.startsWith( "repositoryScanning" ) || key.startsWith(
- "remoteRepositories" ) || key.startsWith( "managedRepositories" ) || key.startsWith(
- "repositoryGroups" ) )
+ if ( key.startsWith( "repositories" ) //
+ || key.startsWith( "proxyConnectors" ) //
+ || key.startsWith( "networkProxies" ) //
+ || key.startsWith( "repositoryScanning" ) //
+ || key.startsWith( "remoteRepositories" ) //
+ || key.startsWith( "managedRepositories" ) //
+ || key.startsWith( "repositoryGroups" ) ) //
{
foundList = true;
}
@@ -537,8 +540,6 @@ public class DefaultArchivaConfiguration
{
c.setRefreshCronExpression( escapeCronExpression( c.getRefreshCronExpression() ) );
}
-
-
}
private Registry createDefaultConfigurationFile()
@@ -558,8 +559,7 @@ public class DefaultArchivaConfiguration
throw new RegistryException(
"Unable to create configuration file in either user [" + userConfigFilename + "] or alternative ["
+ altConfigFilename
- + "] locations on disk, usually happens when not allowed to write to those locations."
- );
+ + "] locations on disk, usually happens when not allowed to write to those locations." );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9473241/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
index 34ed1b6..3da5a37 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
@@ -731,7 +731,7 @@ public class DefaultRedbackRuntimeConfigurationAdmin
{
Collection<String> keys = userConfiguration.getKeys();
- Set<String> keysSet = new HashSet<String>( keys );
+ Set<String> keysSet = new HashSet<>( keys );
keysSet.addAll( getRedbackRuntimeConfiguration().getConfigurationProperties().keySet() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9473241/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
index 89cd78b..b0107cc 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
@@ -77,7 +77,7 @@ import java.util.Map;
public abstract class AbstractRestService
{
- protected Logger log = LoggerFactory.getLogger( getClass() );
+ protected final Logger log = LoggerFactory.getLogger( getClass() );
@Inject
private List<AuditListener> auditListeners = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/archiva/blob/d9473241/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
index 209c405..5d3aa8e 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
@@ -62,6 +62,7 @@ public class DefaultRedbackRuntimeConfigurationService
extends AbstractRestService
implements RedbackRuntimeConfigurationService
{
+
@Inject
private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin;
@@ -97,7 +98,12 @@ public class DefaultRedbackRuntimeConfigurationService
{
try
{
- return redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration();
+ RedbackRuntimeConfiguration redbackRuntimeConfiguration =
+ redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration();
+
+ log.debug( "getRedbackRuntimeConfiguration -> {}", redbackRuntimeConfiguration );
+
+ return redbackRuntimeConfiguration;
}
catch ( RepositoryAdminException e )
{