You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2014/04/17 22:27:22 UTC
[1/2] git commit: assert from org.junit
Repository: archiva
Updated Branches:
refs/heads/master 552724dbe -> 1d929b31f
assert from org.junit
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/145c89e7
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/145c89e7
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/145c89e7
Branch: refs/heads/master
Commit: 145c89e731fcdc655df6dcf47011cec5bd985ce8
Parents: 552724d
Author: Eric Barboni <sk...@apache.org>
Authored: Thu Apr 17 21:56:19 2014 +0200
Committer: Eric Barboni <sk...@apache.org>
Committed: Thu Apr 17 21:56:19 2014 +0200
----------------------------------------------------------------------
.../org/apache/archiva/xml/LatinEntityResolutionReaderTest.java | 2 +-
.../apache/archiva/webdav/AbstractRepositoryServletTestCase.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/145c89e7/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java
index 137018c..188b3b1 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/archiva/xml/LatinEntityResolutionReaderTest.java
@@ -19,9 +19,9 @@ package org.apache.archiva.xml;
* under the License.
*/
-import junit.framework.Assert;
import org.dom4j.DocumentException;
import org.dom4j.io.SAXReader;
+import org.junit.Assert;
import java.io.BufferedReader;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/archiva/blob/145c89e7/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
index 311a83f..58f51b1 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
@@ -24,7 +24,6 @@ import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.WebRequest;
import com.gargoylesoftware.htmlunit.WebResponse;
-import junit.framework.Assert;
import junit.framework.TestCase;
import net.sf.ehcache.CacheManager;
import org.apache.archiva.admin.model.beans.ManagedRepository;
@@ -39,6 +38,7 @@ import org.apache.archiva.webdav.util.MavenIndexerCleaner;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
[2/2] git commit: jdk7 (multicatch diamond)
Posted by sk...@apache.org.
jdk7 (multicatch diamond)
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/1d929b31
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/1d929b31
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/1d929b31
Branch: refs/heads/master
Commit: 1d929b31fb2db2a28c3ea10f135f4b841041a513
Parents: 145c89e
Author: Eric Barboni <sk...@apache.org>
Authored: Thu Apr 17 22:13:54 2014 +0200
Committer: Eric Barboni <sk...@apache.org>
Committed: Thu Apr 17 22:13:54 2014 +0200
----------------------------------------------------------------------
.../configuration/DefaultArchivaConfiguration.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/1d929b31/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 bea3eff..6373a50 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
@@ -147,12 +147,12 @@ public class DefaultArchivaConfiguration
/**
* Configuration Listeners we've registered.
*/
- private Set<ConfigurationListener> listeners = new HashSet<ConfigurationListener>();
+ private Set<ConfigurationListener> listeners = new HashSet<>();
/**
* Registry Listeners we've registered.
*/
- private Set<RegistryListener> registryListeners = new HashSet<RegistryListener>();
+ private Set<RegistryListener> registryListeners = new HashSet<>();
/**
* Boolean to help determine if the configuration exists as a result of pulling in
@@ -204,9 +204,8 @@ public class DefaultArchivaConfiguration
config.getRepositoryGroupsAsMap();
if ( !config.getRepositories().isEmpty() )
{
- for ( Iterator<V1RepositoryConfiguration> i = config.getRepositories().iterator(); i.hasNext(); )
+ for ( V1RepositoryConfiguration r : config.getRepositories() )
{
- V1RepositoryConfiguration r = i.next();
r.setScanned( r.isIndexed() );
if ( StringUtils.startsWith( r.getUrl(), "file://" ) )
@@ -699,11 +698,7 @@ public class DefaultArchivaConfiguration
loadConfiguration();
handleUpgradeConfiguration();
}
- catch ( IndeterminateConfigurationException e )
- {
- throw new RuntimeException( "failed during upgrade from previous version" + e.getMessage(), e );
- }
- catch ( RegistryException e )
+ catch ( IndeterminateConfigurationException | RegistryException e )
{
throw new RuntimeException( "failed during upgrade from previous version" + e.getMessage(), e );
}
@@ -814,9 +809,7 @@ public class DefaultArchivaConfiguration
private Configuration unescapeExpressions( Configuration config )
{
// TODO: for commons-configuration 1.3 only
- for ( Iterator<ManagedRepositoryConfiguration> i = config.getManagedRepositories().iterator(); i.hasNext(); )
- {
- ManagedRepositoryConfiguration c = i.next();
+ for ( ManagedRepositoryConfiguration c : config.getManagedRepositories() ) {
c.setLocation( removeExpressions( c.getLocation() ) );
c.setRefreshCronExpression( unescapeCronExpression( c.getRefreshCronExpression() ) );
}