Merge pull request #22 from pdowler/master

fix GroupURI to check that scheme is ivo

cadc-access-control/build.gradle

@@ -15,7 +15,7 @@ sourceCompatibility = 1.7
 
 group = 'org.opencadc'
 
-version = '1.1.3'
+version = '1.1.4'
 
 mainClassName = 'ca.nrc.cadc.ac.client.Main'
 

cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java

@@ -99,9 +99,9 @@ public class GroupURI
         }
 
         // Ensure the scheme is correct
-        if (uri.getScheme() == null)
+        if (uri.getScheme() == null || !"ivo".equals(uri.getScheme()))
         {
-            throw new IllegalArgumentException("GroupURI scheme is required.");
+            throw new IllegalArgumentException("GroupURI scheme must be 'ivo'.");
         }
 
         if (uri.getAuthority() == null)

cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java

@@ -38,6 +38,9 @@ public class GroupURITest
             // no scheme
             assertIllegalArgument("example.org/gms?gname", "scheme");
             
+            // wrong scheme
+            assertIllegalArgument("gms://example.org/gms?gname", "scheme");
+
             // no authority
             assertIllegalArgument("ivo://gms?gname", "authority");