Update geogig version to 1.2-SNAPSHOT

geoserver · Jul 18, 2017 · 072437d · 072437d
1 parent 7596973
commit 072437d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/community/geogig/pom.xml b/src/community/geogig/pom.xml
@@ -15,7 +15,7 @@
   <name>GeoGig GeoServer integration</name>
 
   <properties>
-    <geogig.version>1.1-SNAPSHOT</geogig.version>
+    <geogig.version>1.2-SNAPSHOT</geogig.version>
     <jline.version>2.12</jline.version>
     <mockito.version>1.8.5</mockito.version>
     <logback.version>1.1.2</logback.version>

diff --git a/...y/geogig/src/main/java/org/geogig/geoserver/config/GeoServerGeoGigRepositoryResolver.java b/...y/geogig/src/main/java/org/geogig/geoserver/config/GeoServerGeoGigRepositoryResolver.java
@@ -33,7 +33,12 @@ public static String getURI(String repoName) {
 
     @Override
     public boolean canHandle(URI repoURI) {
-        return repoURI != null && GEOSERVER_URI_SCHEME.equals(repoURI.getScheme());
+        return repoURI != null && canHandleURIScheme(repoURI.getScheme());
+    }
+
+    @Override
+    public boolean canHandleURIScheme(String scheme) {
+        return scheme != null && GEOSERVER_URI_SCHEME.equals(scheme);
     }
 
     @Override
@@ -75,8 +80,10 @@ public Repository open(URI repositoryLocation) throws RepositoryConnectionExcept
         RepositoryInfo info = repoMgr.getByRepoName(name);
         if (info != null) {
             // get the native RepositoryResolver for the location and open it directly
-            // Using the RepositryManager to get the repo would cause the repo to be managed by the RepositoryManager,
-            // when this repo should be managed by the DataStore. The DataStore will close this repo instance when
+            // Using the RepositryManager to get the repo would cause the repo to be managed by the
+            // RepositoryManager,
+            // when this repo should be managed by the DataStore. The DataStore will close this repo
+            // instance when
             // GeoServer decides to dispose the DataStore.
             Repository repo = RepositoryResolver.load(info.getLocation());
             checkState(repo.isOpen(), "RepositoryManager returned a closed repository for %s",
@@ -104,5 +111,4 @@ public URI buildRepoURI(URI rootRepoURI, String repoName) {
     public List<String> listRepoNamesUnderRootURI(URI rootRepoURI) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
-
 }
diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/config/RepositoryManager.java b/src/community/geogig/src/main/java/org/geogig/geoserver/config/RepositoryManager.java
@@ -41,7 +41,7 @@
 import org.locationtech.geogig.porcelain.ConfigOp;
 import org.locationtech.geogig.porcelain.InitOp;
 import org.locationtech.geogig.remote.IRemoteRepo;
-import org.locationtech.geogig.remote.RemoteUtils;
+import org.locationtech.geogig.remote.RemoteResolver;
 import org.locationtech.geogig.repository.Context;
 import org.locationtech.geogig.repository.Hints;
 import org.locationtech.geogig.repository.Remote;
@@ -414,7 +414,7 @@ private static Ref pingRemote(Remote remote) throws Exception {
         try {
             Hints hints = Hints.readOnly();
             Repository localRepo = GlobalContextBuilder.builder().build(hints).repository();
-            remoteRepo = RemoteUtils.newRemote(localRepo, remote, null);
+            remoteRepo = RemoteResolver.newRemote(localRepo, remote, null);
             if (!remoteRepo.isPresent()) {
                 throw new IllegalArgumentException("Repository not found or not reachable");
             } else {

diff --git a/.../geogig/src/test/java/org/geogig/geoserver/functional/GeoServerFunctionalTestContext.java b/.../geogig/src/test/java/org/geogig/geoserver/functional/GeoServerFunctionalTestContext.java
@@ -40,7 +40,7 @@
 import org.locationtech.geogig.repository.Repository;
 import org.locationtech.geogig.repository.RepositoryResolver;
 import org.locationtech.geogig.repository.impl.GeoGIG;
-import org.locationtech.geogig.web.api.TestData;
+import org.locationtech.geogig.test.TestData;
 import org.opengis.feature.Feature;
 import org.opengis.feature.type.FeatureType;
 import org.restlet.data.Method;