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 2016/09/14 10:51:07 UTC
[1/3] archiva git commit: Removing trailing slash in remote
repository check
Repository: archiva
Updated Branches:
refs/heads/master c997c883f -> e7e84d1bc
Removing trailing slash in remote repository check
See https://issues.apache.org/jira/browse/MRM-1909
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/e4a2e65f
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/e4a2e65f
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/e4a2e65f
Branch: refs/heads/master
Commit: e4a2e65f6e214bc0bb7248fd634e0160580e9ee0
Parents: cae55ac
Author: Martin Stockhammer <m....@web.de>
Authored: Tue Sep 13 18:33:19 2016 +0200
Committer: Martin Stockhammer <m....@web.de>
Committed: Tue Sep 13 18:33:19 2016 +0200
----------------------------------------------------------------------
.../archiva/rest/services/DefaultRemoteRepositoriesService.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/e4a2e65f/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
index 9c0bdd9..5a79487 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
@@ -201,7 +201,8 @@ public class DefaultRemoteRepositoriesService
wagon.connect( new Repository( remoteRepository.getId(), remoteRepository.getUrl() ), proxyInfo );
// we only check connectivity as remote repo can be empty
- wagon.getFileList( "/" );
+ // MRM-1909: Wagon implementation appends a slash already
+ wagon.getFileList( "" );
return Boolean.TRUE;
}
[2/3] archiva git commit: Adding unit test for remote repository check
Posted by ol...@apache.org.
Adding unit test for remote repository check
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/5bb5f765
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/5bb5f765
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/5bb5f765
Branch: refs/heads/master
Commit: 5bb5f76520d5d0873cde6cb6171a44ea402f4f4b
Parents: e4a2e65
Author: Martin Stockhammer <m....@web.de>
Authored: Wed Sep 14 10:22:21 2016 +0200
Committer: Martin Stockhammer <m....@web.de>
Committed: Wed Sep 14 10:22:21 2016 +0200
----------------------------------------------------------------------
.../rest/services/RemoteRepositoriesServiceTest.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/5bb5f765/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
index db85771..3d284e4 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
@@ -146,6 +146,21 @@ public class RemoteRepositoriesServiceTest
}
+ @Test
+ public void checkRemoteConnectivity()
+ throws Exception {
+ RemoteRepositoriesService service = getRemoteRepositoriesService();
+
+ WebClient.client(service).header("Authorization", authorizationHeader);
+
+ int initialSize = service.getRemoteRepositories().size();
+
+ service.addRemoteRepository(getRemoteRepository());
+
+ assertTrue(service.checkRemoteConnectivity("id-new"));
+
+ }
+
RemoteRepository getRemoteRepository()
{
return new RemoteRepository( "id-new", "new one", "http://foo.com", "default", "foo", "foopassword", 120,
[3/3] archiva git commit: Merge branch 'pr/25' [MRM-1909]
Posted by ol...@apache.org.
Merge branch 'pr/25'
[MRM-1909]
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/e7e84d1b
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/e7e84d1b
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/e7e84d1b
Branch: refs/heads/master
Commit: e7e84d1bc769d8982e7fa83881e2e8eff4021e8f
Parents: c997c88 5bb5f76
Author: olivier lamy <ol...@apache.org>
Authored: Wed Sep 14 20:50:40 2016 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Wed Sep 14 20:50:40 2016 +1000
----------------------------------------------------------------------
.../services/DefaultRemoteRepositoriesService.java | 3 ++-
.../rest/services/RemoteRepositoriesServiceTest.java | 15 +++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------