Create passport forms as needed #1531

GluuFederation · Apr 1, 2019 · 1ad99e9 · 1ad99e9
2 parents e6925fd + 1946f9b
commit 1ad99e9
Show file tree

Hide file tree

Showing 251 changed files with 1,170 additions and 1,545 deletions.
diff --git a/api-server/pom.xml b/api-server/pom.xml
@@ -5,7 +5,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.xdi</groupId>
+		<groupId>org.gluu</groupId>
 		<artifactId>oxtrust</artifactId>
 		<version>4.0.0-SNAPSHOT</version>
 	</parent>
@@ -150,27 +150,20 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.xdi</groupId>
+			<groupId>org.gluu</groupId>
 			<artifactId>oxtrust-model</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.xdi</groupId>
+			<groupId>org.gluu</groupId>
 			<artifactId>oxtrust-server</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.wordnik</groupId>
 			<artifactId>swagger-annotations</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.xdi</groupId>
+			<groupId>org.gluu</groupId>
 			<artifactId>uma-rs-resteasy</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-			</exclusions>
-			<version>3.1.4.Final</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/...ver/src/main/java/org/api/server/App.java → ...java/org/gluu/oxtrust/api/server/App.java b/...ver/src/main/java/org/api/server/App.java → ...java/org/gluu/oxtrust/api/server/App.java
@@ -1,4 +1,4 @@
-package org.api.server;
+package org.gluu.oxtrust.api.server;
 
 /**
  * Hello world!

diff --git a/...g/api/server/api/impl/AcrWebResource.java → ...t/api/server/api/impl/AcrWebResource.java b/...g/api/server/api/impl/AcrWebResource.java → ...t/api/server/api/impl/AcrWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -9,8 +9,8 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.api.server.model.AuthenticationMethod;
-import org.api.server.util.Constants;
+import org.gluu.oxtrust.api.server.model.AuthenticationMethod;
+import org.gluu.oxtrust.api.server.util.Constants;
 import org.gluu.oxtrust.ldap.service.ConfigurationService;
 import org.gluu.oxtrust.model.GluuConfiguration;
 import org.gluu.oxtrust.util.OxTrustApiConstants;

diff --git a/...server/api/impl/AttributeWebResource.java → ...server/api/impl/AttributeWebResource.java b/...server/api/impl/AttributeWebResource.java → ...server/api/impl/AttributeWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -19,12 +19,12 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.api.server.util.Constants;
+import org.gluu.oxtrust.api.server.util.Constants;
 import org.gluu.oxtrust.ldap.service.AttributeService;
 import org.gluu.oxtrust.util.OxTrustApiConstants;
 import org.slf4j.Logger;
-import org.xdi.model.GluuAttribute;
-import org.xdi.model.GluuStatus;
+import org.gluu.model.GluuAttribute;
+import org.gluu.model.GluuStatus;
 
 import com.google.common.base.Preconditions;
 import com.wordnik.swagger.annotations.Api;

diff --git a/.../api/server/api/impl/BaseWebResource.java → .../api/server/api/impl/BaseWebResource.java b/.../api/server/api/impl/BaseWebResource.java → .../api/server/api/impl/BaseWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import org.slf4j.Logger;
 

diff --git a/...rver/api/impl/CertificatesWebService.java → ...rver/api/impl/CertificatesWebService.java b/...rver/api/impl/CertificatesWebService.java → ...rver/api/impl/CertificatesWebService.java
@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import java.io.FileInputStream;
 import java.security.cert.X509Certificate;

diff --git a/...pi/server/api/impl/ClientWebResource.java → ...pi/server/api/impl/ClientWebResource.java b/...pi/server/api/impl/ClientWebResource.java → ...pi/server/api/impl/ClientWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +20,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.api.server.util.OxTrustApiConstants;
+import org.gluu.oxtrust.api.server.util.OxTrustApiConstants;
 import org.gluu.oxtrust.ldap.service.ClientService;
 import org.gluu.oxtrust.ldap.service.ScopeService;
 import org.gluu.oxtrust.model.OxAuthClient;

diff --git a/...er/api/impl/ConfigurationWebResource.java → ...er/api/impl/ConfigurationWebResource.java b/...er/api/impl/ConfigurationWebResource.java → ...er/api/impl/ConfigurationWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -9,7 +9,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.api.server.util.Constants;
+import org.gluu.oxtrust.api.server.util.Constants;
 import org.gluu.oxtrust.ldap.service.ConfigurationService;
 import org.gluu.oxtrust.model.GluuConfiguration;
 import org.gluu.oxtrust.util.OxTrustApiConstants;

diff --git a/...api/server/api/impl/GroupWebResource.java → ...api/server/api/impl/GroupWebResource.java b/...api/server/api/impl/GroupWebResource.java → ...api/server/api/impl/GroupWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -21,8 +21,8 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.api.server.model.GluuGroupApi;
-import org.api.server.model.GluuPersonApi;
+import org.gluu.oxtrust.api.server.model.GluuGroupApi;
+import org.gluu.oxtrust.api.server.model.GluuPersonApi;
 import org.gluu.oxtrust.ldap.service.GroupService;
 import org.gluu.oxtrust.ldap.service.OrganizationService;
 import org.gluu.oxtrust.ldap.service.PersonService;

diff --git a/...pi/server/api/impl/OxAuthJsonSetting.java → ...pi/server/api/impl/OxAuthJsonSetting.java b/...pi/server/api/impl/OxAuthJsonSetting.java → ...pi/server/api/impl/OxAuthJsonSetting.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import java.io.Serializable;
 

diff --git a/...pi/impl/OxAuthJsonSettingWebResource.java → ...pi/impl/OxAuthJsonSettingWebResource.java b/...pi/impl/OxAuthJsonSettingWebResource.java → ...pi/impl/OxAuthJsonSettingWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -10,8 +10,8 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.api.server.model.OxAuthJsonConfiguration;
-import org.api.server.util.Constants;
+import org.gluu.oxtrust.api.server.model.OxAuthJsonConfiguration;
+import org.gluu.oxtrust.api.server.util.Constants;
 import org.gluu.oxtrust.ldap.service.JsonConfigurationService;
 import org.gluu.oxtrust.util.OxTrustApiConstants;
 import org.slf4j.Logger;

diff --git a/...i/impl/OxTrustJsonSettingWebResource.java → ...i/impl/OxTrustJsonSettingWebResource.java b/...i/impl/OxTrustJsonSettingWebResource.java → ...i/impl/OxTrustJsonSettingWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -10,12 +10,12 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.api.server.model.OxTrustJsonSetting;
-import org.api.server.util.Constants;
+import org.gluu.oxtrust.api.server.model.OxTrustJsonSetting;
+import org.gluu.oxtrust.api.server.util.Constants;
 import org.gluu.oxtrust.ldap.service.JsonConfigurationService;
 import org.gluu.oxtrust.util.OxTrustApiConstants;
 import org.slf4j.Logger;
-import org.xdi.config.oxtrust.AppConfiguration;
+import org.gluu.config.oxtrust.AppConfiguration;
 
 import com.google.common.base.Preconditions;
 import com.wordnik.swagger.annotations.Api;

diff --git a/...r/api/impl/OxtrustSettingWebResource.java → ...r/api/impl/OxtrustSettingWebResource.java b/...r/api/impl/OxtrustSettingWebResource.java → ...r/api/impl/OxtrustSettingWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -10,8 +10,8 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.api.server.model.OxtrustSetting;
-import org.api.server.util.Constants;
+import org.gluu.oxtrust.api.server.model.OxtrustSetting;
+import org.gluu.oxtrust.api.server.util.Constants;
 import org.gluu.oxtrust.ldap.service.ConfigurationService;
 import org.gluu.oxtrust.model.GluuConfiguration;
 import org.gluu.oxtrust.util.OxTrustApiConstants;

diff --git a/...pi/server/api/impl/PeopleWebResource.java → ...pi/server/api/impl/PeopleWebResource.java b/...pi/server/api/impl/PeopleWebResource.java → ...pi/server/api/impl/PeopleWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -20,7 +20,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.api.server.model.GluuPersonApi;
+import org.gluu.oxtrust.api.server.model.GluuPersonApi;
 import org.gluu.oxtrust.ldap.service.PersonService;
 import org.gluu.oxtrust.model.GluuCustomPerson;
 import org.gluu.oxtrust.util.OxTrustApiConstants;

diff --git a/...api/server/api/impl/ScopeWebResource.java → ...api/server/api/impl/ScopeWebResource.java b/...api/server/api/impl/ScopeWebResource.java → ...api/server/api/impl/ScopeWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,7 +25,7 @@
 import org.gluu.oxtrust.model.OxAuthScope;
 import org.gluu.oxtrust.util.OxTrustApiConstants;
 import org.slf4j.Logger;
-import org.xdi.model.GluuAttribute;
+import org.gluu.model.GluuAttribute;
 
 import com.wordnik.swagger.annotations.ApiOperation;
 

diff --git a/...api/impl/SectorIdentifierWebResource.java → ...api/impl/SectorIdentifierWebResource.java b/...api/impl/SectorIdentifierWebResource.java → ...api/impl/SectorIdentifierWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import java.util.List;
 import java.util.Objects;

diff --git a/...ver/api/impl/ServerStatusWebResource.java → ...ver/api/impl/ServerStatusWebResource.java b/...ver/api/impl/ServerStatusWebResource.java → ...ver/api/impl/ServerStatusWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;

diff --git a/...pi/impl/SmtpConfigurationWebResource.java → ...pi/impl/SmtpConfigurationWebResource.java b/...pi/impl/SmtpConfigurationWebResource.java → ...pi/impl/SmtpConfigurationWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -10,14 +10,14 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.api.server.util.Constants;
+import org.gluu.oxtrust.api.server.util.Constants;
 import org.gluu.oxtrust.ldap.service.ConfigurationService;
 import org.gluu.oxtrust.ldap.service.EncryptionService;
 import org.gluu.oxtrust.model.GluuConfiguration;
 import org.gluu.oxtrust.util.OxTrustApiConstants;
 import org.slf4j.Logger;
-import org.xdi.model.SmtpConfiguration;
-import org.xdi.service.MailService;
+import org.gluu.model.SmtpConfiguration;
+import org.gluu.service.MailService;
 
 import com.google.common.base.Preconditions;
 import com.wordnik.swagger.annotations.Api;

diff --git a/...rver/api/impl/UmaResourceWebResource.java → ...rver/api/impl/UmaResourceWebResource.java b/...rver/api/impl/UmaResourceWebResource.java → ...rver/api/impl/UmaResourceWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,8 +26,8 @@
 import org.gluu.oxtrust.model.OxAuthClient;
 import org.gluu.oxtrust.util.OxTrustApiConstants;
 import org.slf4j.Logger;
-import org.xdi.oxauth.model.uma.persistence.UmaResource;
-import org.xdi.oxauth.model.uma.persistence.UmaScopeDescription;
+import org.gluu.oxauth.model.uma.persistence.UmaResource;
+import org.gluu.oxauth.model.uma.persistence.UmaScopeDescription;
 
 import com.wordnik.swagger.annotations.ApiOperation;
 

diff --git a/.../server/api/impl/UmaScopeWebResource.java → .../server/api/impl/UmaScopeWebResource.java b/.../server/api/impl/UmaScopeWebResource.java → .../server/api/impl/UmaScopeWebResource.java
@@ -1,4 +1,4 @@
-package org.api.server.api.impl;
+package org.gluu.oxtrust.api.server.api.impl;
 
 import java.util.List;
 import java.util.Objects;
@@ -18,11 +18,11 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.api.server.util.Constants;
+import org.gluu.oxtrust.api.server.util.Constants;
 import org.gluu.oxtrust.ldap.service.uma.ScopeDescriptionService;
 import org.gluu.oxtrust.util.OxTrustApiConstants;
 import org.slf4j.Logger;
-import org.xdi.oxauth.model.uma.persistence.UmaScopeDescription;
+import org.gluu.oxauth.model.uma.persistence.UmaScopeDescription;
 
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiResponse;

diff --git a/...pi/server/model/AuthenticationFilter.java → ...pi/server/model/AuthenticationFilter.java b/...pi/server/model/AuthenticationFilter.java → ...pi/server/model/AuthenticationFilter.java
@@ -1,4 +1,4 @@
-package org.api.server.model;
+package org.gluu.oxtrust.api.server.model;
 
 import java.io.Serializable;
 import java.util.HashMap;

diff --git a/...pi/server/model/AuthenticationMethod.java → ...pi/server/model/AuthenticationMethod.java b/...pi/server/model/AuthenticationMethod.java → ...pi/server/model/AuthenticationMethod.java
@@ -1,4 +1,4 @@
-package org.api.server.model;
+package org.gluu.oxtrust.api.server.model;
 
 import java.io.Serializable;
 

diff --git a/...uthenticationProtectionConfiguration.java → ...uthenticationProtectionConfiguration.java b/...uthenticationProtectionConfiguration.java → ...uthenticationProtectionConfiguration.java
@@ -1,4 +1,4 @@
-package org.api.server.model;
+package org.gluu.oxtrust.api.server.model;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...ver/model/ClientAuthenticationFilter.java → ...ver/model/ClientAuthenticationFilter.java b/...ver/model/ClientAuthenticationFilter.java → ...ver/model/ClientAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package org.api.server.model;
+package org.gluu.oxtrust.api.server.model;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...server/model/CorsConfigurationFilter.java → ...server/model/CorsConfigurationFilter.java b/...server/model/CorsConfigurationFilter.java → ...server/model/CorsConfigurationFilter.java
@@ -1,4 +1,4 @@
-package org.api.server.model;
+package org.gluu.oxtrust.api.server.model;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/.../api/server/model/Fido2Configuration.java → .../api/server/model/Fido2Configuration.java b/.../api/server/model/Fido2Configuration.java → .../api/server/model/Fido2Configuration.java
@@ -1,4 +1,4 @@
-package org.api.server.model;
+package org.gluu.oxtrust.api.server.model;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...rg/api/server/model/GluuAttributeApi.java → ...st/api/server/model/GluuAttributeApi.java b/...rg/api/server/model/GluuAttributeApi.java → ...st/api/server/model/GluuAttributeApi.java
@@ -1,11 +1,11 @@
-package org.api.server.model;
+package org.gluu.oxtrust.api.server.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.xdi.model.GluuAttribute;
+import org.gluu.model.GluuAttribute;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/...va/org/api/server/model/GluuGroupApi.java → ...xtrust/api/server/model/GluuGroupApi.java b/...va/org/api/server/model/GluuGroupApi.java → ...xtrust/api/server/model/GluuGroupApi.java
@@ -1,4 +1,4 @@
-package org.api.server.model;
+package org.gluu.oxtrust.api.server.model;
 
 import java.io.Serializable;
 import java.util.List;
@@ -8,8 +8,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
+import org.gluu.model.GluuStatus;
 import org.gluu.oxtrust.model.GluuGroup;
-import org.xdi.model.GluuStatus;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)

diff --git a/...rg/api/server/model/GluuOxAuthClient.java → ...st/api/server/model/GluuOxAuthClient.java b/...rg/api/server/model/GluuOxAuthClient.java → ...st/api/server/model/GluuOxAuthClient.java
@@ -1,4 +1,4 @@
-package org.api.server.model;
+package org.gluu.oxtrust.api.server.model;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -14,8 +14,8 @@
 import org.gluu.oxtrust.model.SignatureAlgorithm;
 import org.gluu.persist.model.base.GluuBoolean;
 import org.gluu.site.ldap.persistence.annotation.LdapAttribute;
-import org.xdi.oxauth.model.common.GrantType;
-import org.xdi.oxauth.model.common.ResponseType;
+import org.gluu.oxauth.model.common.GrantType;
+import org.gluu.oxauth.model.common.ResponseType;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class GluuOxAuthClient implements Serializable{