From 5be7d64c7d27bfee790f57505bc7863934bcd15a Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Sat, 28 Feb 2015 07:24:53 -0500 Subject: [PATCH] moved all uma files to their own package --- .../{openid/connect => uma}/model/ResourceSet.java | 2 +- .../connect => uma}/service/ResourceSetService.java | 4 ++-- .../repository/ResourceSetRepository.java | 4 ++-- .../repository/impl/JpaResourceSetRepository.java | 6 +++--- .../service/impl/DefaultResourceSetService.java | 8 ++++---- .../view/ResourceSetEntityAbbreviatedView.java | 5 +++-- .../connect => uma}/view/ResourceSetEntityView.java | 5 +++-- .../web/ResourceSetRegistrationEndpoint.java | 10 +++++----- 8 files changed, 23 insertions(+), 21 deletions(-) rename openid-connect-common/src/main/java/org/mitre/{openid/connect => uma}/model/ResourceSet.java (98%) rename openid-connect-common/src/main/java/org/mitre/{openid/connect => uma}/service/ResourceSetService.java (93%) rename openid-connect-server/src/main/java/org/mitre/{openid/connect => uma}/repository/ResourceSetRepository.java (92%) rename openid-connect-server/src/main/java/org/mitre/{openid/connect => uma}/repository/impl/JpaResourceSetRepository.java (92%) rename openid-connect-server/src/main/java/org/mitre/{openid/connect => uma}/service/impl/DefaultResourceSetService.java (90%) rename openid-connect-server/src/main/java/org/mitre/{openid/connect => uma}/view/ResourceSetEntityAbbreviatedView.java (95%) rename openid-connect-server/src/main/java/org/mitre/{openid/connect => uma}/view/ResourceSetEntityView.java (96%) rename openid-connect-server/src/main/java/org/mitre/{openid/connect => uma}/web/ResourceSetRegistrationEndpoint.java (97%) diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ResourceSet.java b/openid-connect-common/src/main/java/org/mitre/uma/model/ResourceSet.java similarity index 98% rename from openid-connect-common/src/main/java/org/mitre/openid/connect/model/ResourceSet.java rename to openid-connect-common/src/main/java/org/mitre/uma/model/ResourceSet.java index 4c2e6ab49..013e1f180 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ResourceSet.java +++ b/openid-connect-common/src/main/java/org/mitre/uma/model/ResourceSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ -package org.mitre.openid.connect.model; +package org.mitre.uma.model; import java.util.Set; diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ResourceSetService.java b/openid-connect-common/src/main/java/org/mitre/uma/service/ResourceSetService.java similarity index 93% rename from openid-connect-common/src/main/java/org/mitre/openid/connect/service/ResourceSetService.java rename to openid-connect-common/src/main/java/org/mitre/uma/service/ResourceSetService.java index 3e0ca0c7d..3a7a4ee54 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ResourceSetService.java +++ b/openid-connect-common/src/main/java/org/mitre/uma/service/ResourceSetService.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ -package org.mitre.openid.connect.service; +package org.mitre.uma.service; import java.util.Collection; -import org.mitre.openid.connect.model.ResourceSet; +import org.mitre.uma.model.ResourceSet; /** * diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/ResourceSetRepository.java b/openid-connect-server/src/main/java/org/mitre/uma/repository/ResourceSetRepository.java similarity index 92% rename from openid-connect-server/src/main/java/org/mitre/openid/connect/repository/ResourceSetRepository.java rename to openid-connect-server/src/main/java/org/mitre/uma/repository/ResourceSetRepository.java index 188f630ff..0da5c513d 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/ResourceSetRepository.java +++ b/openid-connect-server/src/main/java/org/mitre/uma/repository/ResourceSetRepository.java @@ -15,11 +15,11 @@ * limitations under the License. *******************************************************************************/ -package org.mitre.openid.connect.repository; +package org.mitre.uma.repository; import java.util.Collection; -import org.mitre.openid.connect.model.ResourceSet; +import org.mitre.uma.model.ResourceSet; /** * @author jricher diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaResourceSetRepository.java b/openid-connect-server/src/main/java/org/mitre/uma/repository/impl/JpaResourceSetRepository.java similarity index 92% rename from openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaResourceSetRepository.java rename to openid-connect-server/src/main/java/org/mitre/uma/repository/impl/JpaResourceSetRepository.java index bb0245c2f..6265903d6 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaResourceSetRepository.java +++ b/openid-connect-server/src/main/java/org/mitre/uma/repository/impl/JpaResourceSetRepository.java @@ -15,7 +15,7 @@ * limitations under the License. *******************************************************************************/ -package org.mitre.openid.connect.repository.impl; +package org.mitre.uma.repository.impl; import java.util.Collection; @@ -23,8 +23,8 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; -import org.mitre.openid.connect.model.ResourceSet; -import org.mitre.openid.connect.repository.ResourceSetRepository; +import org.mitre.uma.model.ResourceSet; +import org.mitre.uma.repository.ResourceSetRepository; import org.mitre.util.jpa.JpaUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultResourceSetService.java b/openid-connect-server/src/main/java/org/mitre/uma/service/impl/DefaultResourceSetService.java similarity index 90% rename from openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultResourceSetService.java rename to openid-connect-server/src/main/java/org/mitre/uma/service/impl/DefaultResourceSetService.java index 3a7cbdf2f..eafe8d412 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultResourceSetService.java +++ b/openid-connect-server/src/main/java/org/mitre/uma/service/impl/DefaultResourceSetService.java @@ -15,13 +15,13 @@ * limitations under the License. *******************************************************************************/ -package org.mitre.openid.connect.service.impl; +package org.mitre.uma.service.impl; import java.util.Collection; -import org.mitre.openid.connect.model.ResourceSet; -import org.mitre.openid.connect.repository.ResourceSetRepository; -import org.mitre.openid.connect.service.ResourceSetService; +import org.mitre.uma.model.ResourceSet; +import org.mitre.uma.repository.ResourceSetRepository; +import org.mitre.uma.service.ResourceSetService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ResourceSetEntityAbbreviatedView.java b/openid-connect-server/src/main/java/org/mitre/uma/view/ResourceSetEntityAbbreviatedView.java similarity index 95% rename from openid-connect-server/src/main/java/org/mitre/openid/connect/view/ResourceSetEntityAbbreviatedView.java rename to openid-connect-server/src/main/java/org/mitre/uma/view/ResourceSetEntityAbbreviatedView.java index 3c65d81fb..84b9469d6 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ResourceSetEntityAbbreviatedView.java +++ b/openid-connect-server/src/main/java/org/mitre/uma/view/ResourceSetEntityAbbreviatedView.java @@ -1,4 +1,4 @@ -package org.mitre.openid.connect.view; +package org.mitre.uma.view; import java.io.IOException; import java.io.Writer; @@ -8,7 +8,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.mitre.openid.connect.config.ConfigurationPropertiesBean; -import org.mitre.openid.connect.model.ResourceSet; +import org.mitre.openid.connect.view.JsonEntityView; +import org.mitre.uma.model.ResourceSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ResourceSetEntityView.java b/openid-connect-server/src/main/java/org/mitre/uma/view/ResourceSetEntityView.java similarity index 96% rename from openid-connect-server/src/main/java/org/mitre/openid/connect/view/ResourceSetEntityView.java rename to openid-connect-server/src/main/java/org/mitre/uma/view/ResourceSetEntityView.java index 674835409..eb69fce32 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ResourceSetEntityView.java +++ b/openid-connect-server/src/main/java/org/mitre/uma/view/ResourceSetEntityView.java @@ -1,4 +1,4 @@ -package org.mitre.openid.connect.view; +package org.mitre.uma.view; import java.io.IOException; import java.io.Writer; @@ -8,7 +8,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.mitre.openid.connect.config.ConfigurationPropertiesBean; -import org.mitre.openid.connect.model.ResourceSet; +import org.mitre.openid.connect.view.JsonEntityView; +import org.mitre.uma.model.ResourceSet; import org.mitre.util.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ResourceSetRegistrationEndpoint.java b/openid-connect-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java similarity index 97% rename from openid-connect-server/src/main/java/org/mitre/openid/connect/web/ResourceSetRegistrationEndpoint.java rename to openid-connect-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java index 0011a5999..8f4cba275 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ResourceSetRegistrationEndpoint.java +++ b/openid-connect-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. *******************************************************************************/ -package org.mitre.openid.connect.web; +package org.mitre.uma.web; import static org.mitre.util.JsonUtils.getAsLong; import static org.mitre.util.JsonUtils.getAsString; @@ -26,13 +26,13 @@ import java.util.Set; import org.mitre.oauth2.service.SystemScopeService; import org.mitre.openid.connect.config.ConfigurationPropertiesBean; -import org.mitre.openid.connect.model.ResourceSet; -import org.mitre.openid.connect.service.ResourceSetService; import org.mitre.openid.connect.view.HttpCodeView; import org.mitre.openid.connect.view.JsonEntityView; import org.mitre.openid.connect.view.JsonErrorView; -import org.mitre.openid.connect.view.ResourceSetEntityAbbreviatedView; -import org.mitre.openid.connect.view.ResourceSetEntityView; +import org.mitre.uma.model.ResourceSet; +import org.mitre.uma.service.ResourceSetService; +import org.mitre.uma.view.ResourceSetEntityAbbreviatedView; +import org.mitre.uma.view.ResourceSetEntityView; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired;