github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

moved all uma files to their own package

pull/708/merge
Justin Richer 2015-02-28 07:24:53 -05:00
parent 0d96b6a28a
commit 5be7d64c7d
8 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openid-connect-common/src/main/java/org/mitre/openid/connect/model/ResourceSet.java → openid-connect-common/src/main/java/org/mitre/uma/model/ResourceSet.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*******************************************************************************/ *******************************************************************************/
package org.mitre.openid.connect.model; package org.mitre.uma.model;
import java.util.Set; import java.util.Set;

4
openid-connect-common/src/main/java/org/mitre/openid/connect/service/ResourceSetService.java → openid-connect-common/src/main/java/org/mitre/uma/service/ResourceSetService.java
View File

@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*******************************************************************************/ *******************************************************************************/
package org.mitre.openid.connect.service; package org.mitre.uma.service;
import java.util.Collection; import java.util.Collection;
import org.mitre.openid.connect.model.ResourceSet; import org.mitre.uma.model.ResourceSet;
/** /**
* *

4
openid-connect-server/src/main/java/org/mitre/openid/connect/repository/ResourceSetRepository.java → openid-connect-server/src/main/java/org/mitre/uma/repository/ResourceSetRepository.java
View File

@ -15,11 +15,11 @@
* limitations under the License. * limitations under the License.
*******************************************************************************/ *******************************************************************************/
package org.mitre.openid.connect.repository; package org.mitre.uma.repository;
import java.util.Collection; import java.util.Collection;
import org.mitre.openid.connect.model.ResourceSet; import org.mitre.uma.model.ResourceSet;
/** /**
* @author jricher * @author jricher

6
openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaResourceSetRepository.java → openid-connect-server/src/main/java/org/mitre/uma/repository/impl/JpaResourceSetRepository.java
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*******************************************************************************/ *******************************************************************************/
package org.mitre.openid.connect.repository.impl; package org.mitre.uma.repository.impl;
import java.util.Collection; import java.util.Collection;
@ -23,8 +23,8 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import org.mitre.openid.connect.model.ResourceSet; import org.mitre.uma.model.ResourceSet;
import org.mitre.openid.connect.repository.ResourceSetRepository; import org.mitre.uma.repository.ResourceSetRepository;
import org.mitre.util.jpa.JpaUtil; import org.mitre.util.jpa.JpaUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

8
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultResourceSetService.java → openid-connect-server/src/main/java/org/mitre/uma/service/impl/DefaultResourceSetService.java
View File

@ -15,13 +15,13 @@
* limitations under the License. * limitations under the License.
*******************************************************************************/ *******************************************************************************/
package org.mitre.openid.connect.service.impl; package org.mitre.uma.service.impl;
import java.util.Collection; import java.util.Collection;
import org.mitre.openid.connect.model.ResourceSet; import org.mitre.uma.model.ResourceSet;
import org.mitre.openid.connect.repository.ResourceSetRepository; import org.mitre.uma.repository.ResourceSetRepository;
import org.mitre.openid.connect.service.ResourceSetService; import org.mitre.uma.service.ResourceSetService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

5
openid-connect-server/src/main/java/org/mitre/openid/connect/view/ResourceSetEntityAbbreviatedView.java → openid-connect-server/src/main/java/org/mitre/uma/view/ResourceSetEntityAbbreviatedView.java
View File

@ -1,4 +1,4 @@
package org.mitre.openid.connect.view; package org.mitre.uma.view;
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
@ -8,7 +8,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.mitre.openid.connect.config.ConfigurationPropertiesBean; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

5
openid-connect-server/src/main/java/org/mitre/openid/connect/view/ResourceSetEntityView.java → openid-connect-server/src/main/java/org/mitre/uma/view/ResourceSetEntityView.java
View File

@ -1,4 +1,4 @@
package org.mitre.openid.connect.view; package org.mitre.uma.view;
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
@ -8,7 +8,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.mitre.openid.connect.config.ConfigurationPropertiesBean; 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.mitre.util.JsonUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

10
openid-connect-server/src/main/java/org/mitre/openid/connect/web/ResourceSetRegistrationEndpoint.java → openid-connect-server/src/main/java/org/mitre/uma/web/ResourceSetRegistrationEndpoint.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.getAsLong;
import static org.mitre.util.JsonUtils.getAsString; import static org.mitre.util.JsonUtils.getAsString;
@ -26,13 +26,13 @@ import java.util.Set;
import org.mitre.oauth2.service.SystemScopeService; import org.mitre.oauth2.service.SystemScopeService;
import org.mitre.openid.connect.config.ConfigurationPropertiesBean; 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.HttpCodeView;
import org.mitre.openid.connect.view.JsonEntityView; import org.mitre.openid.connect.view.JsonEntityView;
import org.mitre.openid.connect.view.JsonErrorView; import org.mitre.openid.connect.view.JsonErrorView;
import org.mitre.openid.connect.view.ResourceSetEntityAbbreviatedView; import org.mitre.uma.model.ResourceSet;
import org.mitre.openid.connect.view.ResourceSetEntityView; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;