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/05/01 06:30:16 UTC
[3/3] git commit: [MRM-1837] DefaultArchivaConfiguration holds
references to classes
[MRM-1837] DefaultArchivaConfiguration holds references to classes
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/10a07617
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/10a07617
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/10a07617
Branch: refs/heads/master
Commit: 10a0761768c8704497aefe730677bfd38a39a0a1
Parents: 7808ee5
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu May 1 14:29:28 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu May 1 14:29:28 2014 +1000
----------------------------------------------------------------------
.../DefaultArchivaConfiguration.java | 38 +++++++++++++-------
.../consumers/core/AutoRemoveConsumer.java | 2 +-
.../repository/RepositoryPurgeConsumer.java | 2 +-
.../consumers/lucene/NexusIndexerConsumer.java | 2 +-
.../legacy/LegacyConverterArtifactConsumer.java | 6 ----
pom.xml | 4 +--
6 files changed, 30 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/10a07617/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 9b403d1..c6cc953 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)
@@ -204,7 +204,7 @@ public class DefaultArchivaConfiguration
config.getRepositoryGroupsAsMap();
if ( !config.getRepositories().isEmpty() )
{
- for ( V1RepositoryConfiguration r : config.getRepositories() )
+ for ( V1RepositoryConfiguration r : config.getRepositories() )
{
r.setScanned( r.isIndexed() );
@@ -269,8 +269,7 @@ public class DefaultArchivaConfiguration
// Fix Proxy Connector Settings.
// Create a copy of the list to read from (to prevent concurrent modification exceptions)
- List<ProxyConnectorConfiguration> proxyConnectorList =
- new ArrayList<>( config.getProxyConnectors() );
+ List<ProxyConnectorConfiguration> proxyConnectorList = new ArrayList<>( config.getProxyConnectors() );
// Remove the old connector list.
config.getProxyConnectors().clear();
@@ -440,7 +439,7 @@ public class DefaultArchivaConfiguration
return registry.getSubset( KEY );
}
- @SuppressWarnings ( "unchecked" )
+ @SuppressWarnings( "unchecked" )
@Override
public synchronized void save( Configuration configuration )
throws IndeterminateConfigurationException, RegistryException
@@ -559,7 +558,8 @@ 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."
+ );
}
}
@@ -584,7 +584,7 @@ public class DefaultArchivaConfiguration
/**
* Attempts to write the contents to a file, if an IOException occurs, return false.
- * <p>
+ * <p/>
* The file will be created if the directory to the file exists, otherwise this will return false.
*
* @param filetype the filetype (freeform text) to use in logging messages when failure to write.
@@ -602,7 +602,7 @@ public class DefaultArchivaConfiguration
if ( file.getParentFile() != null )
{
// Check that directory exists
- if ( ! file.getParentFile().isDirectory() )
+ if ( !file.getParentFile().isDirectory() )
{
// Directory to file must exist for file to be created
return false;
@@ -651,7 +651,6 @@ public class DefaultArchivaConfiguration
}
-
@Override
public void addChangeListener( RegistryListener listener )
{
@@ -680,6 +679,18 @@ public class DefaultArchivaConfiguration
{
boolean removed = registryListeners.remove( listener );
log.debug( "RegistryListener: '{}' removed {}", listener, removed );
+
+ Registry section = registry.getSection( KEY + ".user" );
+ if ( section != null )
+ {
+ section.removeChangeListener( listener );
+ }
+ section = registry.getSection( KEY + ".base" );
+ if ( section != null )
+ {
+ section.removeChangeListener( listener );
+ }
+
}
@PostConstruct
@@ -714,7 +725,7 @@ public class DefaultArchivaConfiguration
catch ( EvaluatorException e )
{
throw new RuntimeException(
- "Unable to evaluate expressions found in " + "userConfigFilename or altConfigFilename.", e);
+ "Unable to evaluate expressions found in " + "userConfigFilename or altConfigFilename.", e );
}
registry.addChangeListener( this );
}
@@ -818,7 +829,8 @@ public class DefaultArchivaConfiguration
private Configuration unescapeExpressions( Configuration config )
{
// TODO: for commons-configuration 1.3 only
- for ( ManagedRepositoryConfiguration c : config.getManagedRepositories() ) {
+ for ( ManagedRepositoryConfiguration c : config.getManagedRepositories() )
+ {
c.setLocation( removeExpressions( c.getLocation() ) );
c.setRefreshCronExpression( unescapeCronExpression( c.getRefreshCronExpression() ) );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/10a07617/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
index 75654c6..d6e9297 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
@@ -167,7 +167,7 @@ public class AutoRemoveConsumer
private void initIncludes()
{
- includes = new ArrayList<String>( filetypes.getFileTypePatterns( FileTypes.AUTO_REMOVE ) );
+ includes = new ArrayList<>( filetypes.getFileTypePatterns( FileTypes.AUTO_REMOVE ) );
}
@PostConstruct
http://git-wip-us.apache.org/repos/asf/archiva/blob/10a07617/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
index 5cc20c4..5b6be2e 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
@@ -238,7 +238,7 @@ public class RepositoryPurgeConsumer
private void initIncludes()
{
- includes = new ArrayList<String>( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
+ includes = new ArrayList<>( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
}
@PostConstruct
http://git-wip-us.apache.org/repos/asf/archiva/blob/10a07617/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 487af91..4e6df8c 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
@@ -266,7 +266,7 @@ public class NexusIndexerConsumer
List<String> indexable = filetypes.getFileTypePatterns( FileTypes.INDEXABLE_CONTENT );
List<String> artifacts = filetypes.getFileTypePatterns( FileTypes.ARTIFACTS );
- includes = new ArrayList<String>( indexable.size() + artifacts.size() );
+ includes = new ArrayList<>( indexable.size() + artifacts.size() );
includes.addAll( indexable );
http://git-wip-us.apache.org/repos/asf/archiva/blob/10a07617/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
index b17a74a..ff15d3b 100644
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
@@ -58,15 +58,9 @@ public class LegacyConverterArtifactConsumer
{
private Logger log = LoggerFactory.getLogger( LegacyConverterArtifactConsumer.class );
- /**
- *
- */
@Inject
private ArtifactConverter artifactConverter;
- /**
- *
- */
private ArtifactFactory artifactFactory;
private ManagedRepositoryContent managedRepository;
http://git-wip-us.apache.org/repos/asf/archiva/blob/10a07617/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f758398..e947718 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
<redback.version>2.2</redback.version>
<redback.cache.version>2.2</redback.cache.version>
<redback.quartz.version>2.1</redback.quartz.version>
- <redback.registry.version>2.2</redback.registry.version>
+ <redback.registry.version>2.3-SNAPSHOT</redback.registry.version>
<redback.spring-utils.version>2.1</redback.spring-utils.version>
<redback.taskqueue.version>2.1</redback.taskqueue.version>
<slf4j.version>1.7.7</slf4j.version>
@@ -614,7 +614,7 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.9</version>
+ <version>1.10</version>
<exclusions>
<exclusion>
<groupId>commons-beanutils</groupId>