From ca453475b15d04bd19156dbf9f534604db07f143 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 14 Oct 2014 15:17:24 +0000 Subject: [PATCH] git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/uri-resolver-manager@100681 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../portlets/user/uriresolvermanager/UriResolverManager.java | 2 +- .../{util => readers}/ApplicationProfileException.java | 2 +- .../{util => readers}/RuntimeResourceReader.java | 3 ++- .../{util => readers}/UriResolverMapReader.java | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) rename src/main/java/org/gcube/portlets/user/uriresolvermanager/{util => readers}/ApplicationProfileException.java (73%) rename src/main/java/org/gcube/portlets/user/uriresolvermanager/{util => readers}/RuntimeResourceReader.java (97%) rename src/main/java/org/gcube/portlets/user/uriresolvermanager/{util => readers}/UriResolverMapReader.java (97%) diff --git a/src/main/java/org/gcube/portlets/user/uriresolvermanager/UriResolverManager.java b/src/main/java/org/gcube/portlets/user/uriresolvermanager/UriResolverManager.java index 34396eb..caf8620 100644 --- a/src/main/java/org/gcube/portlets/user/uriresolvermanager/UriResolverManager.java +++ b/src/main/java/org/gcube/portlets/user/uriresolvermanager/UriResolverManager.java @@ -8,7 +8,7 @@ import java.util.Set; import org.gcube.portlets.user.uriresolvermanager.exception.IllegalArgumentException; import org.gcube.portlets.user.uriresolvermanager.exception.UriResolverMapException; -import org.gcube.portlets.user.uriresolvermanager.util.UriResolverMapReader; +import org.gcube.portlets.user.uriresolvermanager.readers.UriResolverMapReader; /** * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it diff --git a/src/main/java/org/gcube/portlets/user/uriresolvermanager/util/ApplicationProfileException.java b/src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/ApplicationProfileException.java similarity index 73% rename from src/main/java/org/gcube/portlets/user/uriresolvermanager/util/ApplicationProfileException.java rename to src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/ApplicationProfileException.java index b30b0ce..ea65017 100644 --- a/src/main/java/org/gcube/portlets/user/uriresolvermanager/util/ApplicationProfileException.java +++ b/src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/ApplicationProfileException.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.uriresolvermanager.util; +package org.gcube.portlets.user.uriresolvermanager.readers; @SuppressWarnings("serial") public class ApplicationProfileException extends Exception { diff --git a/src/main/java/org/gcube/portlets/user/uriresolvermanager/util/RuntimeResourceReader.java b/src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/RuntimeResourceReader.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/uriresolvermanager/util/RuntimeResourceReader.java rename to src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/RuntimeResourceReader.java index dd283fd..0975e51 100644 --- a/src/main/java/org/gcube/portlets/user/uriresolvermanager/util/RuntimeResourceReader.java +++ b/src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/RuntimeResourceReader.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.portlets.user.uriresolvermanager.util; +package org.gcube.portlets.user.uriresolvermanager.readers; import static org.gcube.resources.discovery.icclient.ICFactory.clientFor; import static org.gcube.resources.discovery.icclient.ICFactory.queryFor; @@ -16,6 +16,7 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.Property; import org.gcube.common.resources.gcore.utils.Group; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.portlets.user.uriresolvermanager.entity.ServiceProperty; +import org.gcube.portlets.user.uriresolvermanager.util.ScopeUtil; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; import org.slf4j.Logger; diff --git a/src/main/java/org/gcube/portlets/user/uriresolvermanager/util/UriResolverMapReader.java b/src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/UriResolverMapReader.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/uriresolvermanager/util/UriResolverMapReader.java rename to src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/UriResolverMapReader.java index 935cbe0..95a31aa 100644 --- a/src/main/java/org/gcube/portlets/user/uriresolvermanager/util/UriResolverMapReader.java +++ b/src/main/java/org/gcube/portlets/user/uriresolvermanager/readers/UriResolverMapReader.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.uriresolvermanager.util; +package org.gcube.portlets.user.uriresolvermanager.readers; import static org.gcube.resources.discovery.icclient.ICFactory.client; @@ -12,6 +12,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.gcube.common.resources.gcore.utils.XPathHelper; import org.gcube.common.scope.api.ScopeProvider; +import org.gcube.portlets.user.uriresolvermanager.util.ScopeUtil; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.Query; import org.gcube.resources.discovery.client.queries.impl.QueryBox;