Simplify RestEasy endpoints URLs #594

GluuFederation · Jun 21, 2017 · 09254fb · 09254fb
1 parent e75b719
commit 09254fb
Show file tree

Hide file tree

Showing 87 changed files with 86 additions and 292 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 oxTrust
 ======
-<p>oxTrust is a JBoss Seam web application for oxAuth administration, and for configuring inter-domain trust management. 
+<p>oxTrust is a Weld based web application for oxAuth administration, and for configuring inter-domain trust management. 
 oxTrust enables administrators to manage what information about people is being exposed to which partner websites. oxTrust is also the local management interface that handles other server instance specific configurations, and provides a mechanism for IT administrators to support people at the organization who are having trouble accessing a website or network resource.</p>
 <p>oxTrust is tightly coupled with <a href="https://github.com/GluuFederation/oxAuth">oxAuth</a>. oxAuth configuration is stored in LDAP, and it would be hard to generate the right configuration entries without oxTrust. The projects are separate projects because in a high throughput cluster deployment, many oxAuth servers are needed versus a few oxTrust instances.</p>
 <p>Refer to <a href="https://github.com/GluuFederation/install">https://github.com/GluuFederation/install</a> for installation instructions.</p>

diff --git a/configuration/oxtrust-config.json b/configuration/oxtrust-config.json
@@ -7,7 +7,7 @@
 
     "baseDN":"o=gluu",
 
-    "baseEndpoint":"${config.host.schema}://${config.host.idp_name}/identity/seam/resource/restv1",
+    "baseEndpoint":"${config.host.schema}://${config.host.idp_name}/identity/restv1",
 
     "idpUrl":"${config.host.schema}://${config.host.idp_name}",
     "applianceUrl":"${config.host.schema}://${config.host.idp_name}",

diff --git a/server/profiles/default/config-oxtrust-test-data.properties b/server/profiles/default/config-oxtrust-test-data.properties
@@ -7,7 +7,7 @@ user.admin.group.member.inum=@!1111!2222!3333
 group.owner.user.inum=@!1111!2222!3333
 group.non_member.user.inum=@!1111!2222!3333
 
-scim2.userext.create_json={"schemas":["urn:ietf:params:scim:schemas:core:2.0:User","urn:ietf:params:scim:schemas:extension:gluu:2.0:User"],"urn:ietf:params:scim:schemas:extension:gluu:2.0:User": {"scimCustomFirst":"[1000,2000]","scimCustomSecond":["2016-02-23T15:35:22Z"],"scimCustomThird":3000},"externalId":"scimclient","userName":"userjson.add.username","name":{"givenName":"json","familyName":"json","middleName":"N/A","honorificPrefix":"N/A","honorificSuffix":"N/A"},"displayName":"json json","nickName":"json","profileUrl":"http://www.gluu.org/","emails":[{"value":"json@gluu.org","type":"work","primary":"true"},{"value":"json2@gluu.org","type":"home","primary":"false"}],"addresses":[{"type":"work","streetAddress":"621 East 6th Street Suite 200","locality":"Austin","region":"TX","postalCode":"78701","country":"US","formatted":"621 East 6th Street Suite 200  Austin , TX 78701 US","primary":"true"}],"phoneNumbers":[{"value":"646-345-2346","type":"work"}],"ims":[{"value":"nynytest_user","type":"Skype"}],"userType":"CEO","title":"CEO","preferredLanguage":"en-us","locale":"en_US","active":"true","password":"secret","roles":[{"value":"Owner"}],"entitlements":[{"value":"full access"}],"x509Certificates":[{"value":"MIIDQzCCAqygAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwTjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFDASBgNVBAoMC2V4YW1wbGUuY29tMRQwEgYDVQQDDAtleGFtcGxlLmNvbTAeFw0xMTEwMjIwNjI0MzFaFw0xMjEwMDQwNjI0MzFa MH8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRQwEgYDVQQKDAtleGFtcGxlLmNvbTEhMB8GA1UEAwwYTXMuIEJhcmJhcmEgSiBKZW5zZW4gSUlJMSIwIAYJKoZIhvcNAQkBFhNiamVuc2VuQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7Kr+Dcds/JQ5GwejJFcBIP682X3xpjis56AK02bc1FLgzdLI8auoR+cC9/Vrh5t66HkQIOdA4unHh0AaZ4xL5PhVbXIPMB5vAPKpzz5iPSi8xO8SL7I7SDhcBVJhqVqr3HgllEG6UClDdHO7nkLuwXq8HcISKkbT5WFTVfFZzidPl8HZ7DhXkZIRtJwBweq4bvm3hM1Os7UQH05ZS6cVDgweKNwdLLrT51ikSQG3DYrl+ft781UQRIqxgwqCfXEuDiinPh0kkvIi5jivVu1Z9QiwlYEdRbLJ4zJQBmDrSGTMYn4lRc2HgHO4DqB/bnMVorHB0CC6AV1QoFK4GPe1LwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU8pD0U0vsZIsaA16lL8En8bx0F/gwHwYDVR0jBBgwFoAUdGeKitcaF7gnzsNwDx708kqaVt0wDQYJKoZIhvcNAQEFBQADgYEAA81SsFnOdYJtNg5Tcq+/ByEDrBgnusx0jloUhByPMEVkoMZ3J7j1ZgI8rAbOkNngX8+pKfTiDz1RC4+dx8oU6Za+4NJXUjlL5CvV6BEYb1+QAEJwitTVvxB/A67g42/vzgAtoRUeDov1+GFiBZ+GNF/cAYKcMtGcrs2i97ZkJMo="}],"meta":{"created":"2010-01-23T04:56:22Z","lastModified":"2011-05-13T04:42:34Z","version":"aversion","location":"http://localhost:8080/identity/seam/resource/restv1/Users/8c4b6c26-efaf-4840-bddf-c0146a8eb2a9"}}
+scim2.userext.create_json={"schemas":["urn:ietf:params:scim:schemas:core:2.0:User","urn:ietf:params:scim:schemas:extension:gluu:2.0:User"],"urn:ietf:params:scim:schemas:extension:gluu:2.0:User": {"scimCustomFirst":"[1000,2000]","scimCustomSecond":["2016-02-23T15:35:22Z"],"scimCustomThird":3000},"externalId":"scimclient","userName":"userjson.add.username","name":{"givenName":"json","familyName":"json","middleName":"N/A","honorificPrefix":"N/A","honorificSuffix":"N/A"},"displayName":"json json","nickName":"json","profileUrl":"http://www.gluu.org/","emails":[{"value":"json@gluu.org","type":"work","primary":"true"},{"value":"json2@gluu.org","type":"home","primary":"false"}],"addresses":[{"type":"work","streetAddress":"621 East 6th Street Suite 200","locality":"Austin","region":"TX","postalCode":"78701","country":"US","formatted":"621 East 6th Street Suite 200  Austin , TX 78701 US","primary":"true"}],"phoneNumbers":[{"value":"646-345-2346","type":"work"}],"ims":[{"value":"nynytest_user","type":"Skype"}],"userType":"CEO","title":"CEO","preferredLanguage":"en-us","locale":"en_US","active":"true","password":"secret","roles":[{"value":"Owner"}],"entitlements":[{"value":"full access"}],"x509Certificates":[{"value":"MIIDQzCCAqygAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwTjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFDASBgNVBAoMC2V4YW1wbGUuY29tMRQwEgYDVQQDDAtleGFtcGxlLmNvbTAeFw0xMTEwMjIwNjI0MzFaFw0xMjEwMDQwNjI0MzFa MH8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRQwEgYDVQQKDAtleGFtcGxlLmNvbTEhMB8GA1UEAwwYTXMuIEJhcmJhcmEgSiBKZW5zZW4gSUlJMSIwIAYJKoZIhvcNAQkBFhNiamVuc2VuQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7Kr+Dcds/JQ5GwejJFcBIP682X3xpjis56AK02bc1FLgzdLI8auoR+cC9/Vrh5t66HkQIOdA4unHh0AaZ4xL5PhVbXIPMB5vAPKpzz5iPSi8xO8SL7I7SDhcBVJhqVqr3HgllEG6UClDdHO7nkLuwXq8HcISKkbT5WFTVfFZzidPl8HZ7DhXkZIRtJwBweq4bvm3hM1Os7UQH05ZS6cVDgweKNwdLLrT51ikSQG3DYrl+ft781UQRIqxgwqCfXEuDiinPh0kkvIi5jivVu1Z9QiwlYEdRbLJ4zJQBmDrSGTMYn4lRc2HgHO4DqB/bnMVorHB0CC6AV1QoFK4GPe1LwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU8pD0U0vsZIsaA16lL8En8bx0F/gwHwYDVR0jBBgwFoAUdGeKitcaF7gnzsNwDx708kqaVt0wDQYJKoZIhvcNAQEFBQADgYEAA81SsFnOdYJtNg5Tcq+/ByEDrBgnusx0jloUhByPMEVkoMZ3J7j1ZgI8rAbOkNngX8+pKfTiDz1RC4+dx8oU6Za+4NJXUjlL5CvV6BEYb1+QAEJwitTVvxB/A67g42/vzgAtoRUeDov1+GFiBZ+GNF/cAYKcMtGcrs2i97ZkJMo="}],"meta":{"created":"2010-01-23T04:56:22Z","lastModified":"2011-05-13T04:42:34Z","version":"aversion","location":"http://localhost:8080/identity/restv1/Users/8c4b6c26-efaf-4840-bddf-c0146a8eb2a9"}}
 
 test.keep.persons=@!8214.2DD7.3392.F903!0001!AE01.CC82!0000!69C2.DD13,@!8214.2DD7.3392.F903!0001!AE01.CC82!0000!7F74.A651,@!8214.2DD7.3392.F903!0001!AE01.CC82!0000!A8F2.DE1E.D7FB
 test.keep.groups=@!8214.2DD7.3392.F903!0001!AE01.CC82!0003!60B7
diff --git a/server/profiles/setup/config-oxtrust-test-data.properties b/server/profiles/setup/config-oxtrust-test-data.properties
@@ -7,4 +7,4 @@ user.admin.group.member.inum=@!1111!2222!3333
 group.owner.user.inum=@!1111!2222!3333
 group.non_member.user.inum=@!1111!2222!3333
 
-scim2.userext.create_json={"schemas":["urn:ietf:params:scim:schemas:core:2.0:User","urn:ietf:params:scim:schemas:extension:gluu:2.0:User"],"urn:ietf:params:scim:schemas:extension:gluu:2.0:User": {"scimCustomFirst":"[1000,2000]","scimCustomSecond":["2016-02-23T15:35:22Z"],"scimCustomThird":3000},"externalId":"scimclient","userName":"userjson.add.username","name":{"givenName":"json","familyName":"json","middleName":"N/A","honorificPrefix":"N/A","honorificSuffix":"N/A"},"displayName":"json json","nickName":"json","profileUrl":"http://www.gluu.org/","emails":[{"value":"json@gluu.org","type":"work","primary":"true"},{"value":"json2@gluu.org","type":"home","primary":"false"}],"addresses":[{"type":"work","streetAddress":"621 East 6th Street Suite 200","locality":"Austin","region":"TX","postalCode":"78701","country":"US","formatted":"621 East 6th Street Suite 200  Austin , TX 78701 US","primary":"true"}],"phoneNumbers":[{"value":"646-345-2346","type":"work"}],"ims":[{"value":"nynytest_user","type":"Skype"}],"userType":"CEO","title":"CEO","preferredLanguage":"en-us","locale":"en_US","active":"true","password":"secret","roles":[{"value":"Owner"}],"entitlements":[{"value":"full access"}],"x509Certificates":[{"value":"MIIDQzCCAqygAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwTjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFDASBgNVBAoMC2V4YW1wbGUuY29tMRQwEgYDVQQDDAtleGFtcGxlLmNvbTAeFw0xMTEwMjIwNjI0MzFaFw0xMjEwMDQwNjI0MzFa MH8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRQwEgYDVQQKDAtleGFtcGxlLmNvbTEhMB8GA1UEAwwYTXMuIEJhcmJhcmEgSiBKZW5zZW4gSUlJMSIwIAYJKoZIhvcNAQkBFhNiamVuc2VuQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7Kr+Dcds/JQ5GwejJFcBIP682X3xpjis56AK02bc1FLgzdLI8auoR+cC9/Vrh5t66HkQIOdA4unHh0AaZ4xL5PhVbXIPMB5vAPKpzz5iPSi8xO8SL7I7SDhcBVJhqVqr3HgllEG6UClDdHO7nkLuwXq8HcISKkbT5WFTVfFZzidPl8HZ7DhXkZIRtJwBweq4bvm3hM1Os7UQH05ZS6cVDgweKNwdLLrT51ikSQG3DYrl+ft781UQRIqxgwqCfXEuDiinPh0kkvIi5jivVu1Z9QiwlYEdRbLJ4zJQBmDrSGTMYn4lRc2HgHO4DqB/bnMVorHB0CC6AV1QoFK4GPe1LwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU8pD0U0vsZIsaA16lL8En8bx0F/gwHwYDVR0jBBgwFoAUdGeKitcaF7gnzsNwDx708kqaVt0wDQYJKoZIhvcNAQEFBQADgYEAA81SsFnOdYJtNg5Tcq+/ByEDrBgnusx0jloUhByPMEVkoMZ3J7j1ZgI8rAbOkNngX8+pKfTiDz1RC4+dx8oU6Za+4NJXUjlL5CvV6BEYb1+QAEJwitTVvxB/A67g42/vzgAtoRUeDov1+GFiBZ+GNF/cAYKcMtGcrs2i97ZkJMo="}],"meta":{"created":"2010-01-23T04:56:22Z","lastModified":"2011-05-13T04:42:34Z","version":"aversion","location":"http://localhost:8080/identity/seam/resource/restv1/Users/8c4b6c26-efaf-4840-bddf-c0146a8eb2a9"}}
+scim2.userext.create_json={"schemas":["urn:ietf:params:scim:schemas:core:2.0:User","urn:ietf:params:scim:schemas:extension:gluu:2.0:User"],"urn:ietf:params:scim:schemas:extension:gluu:2.0:User": {"scimCustomFirst":"[1000,2000]","scimCustomSecond":["2016-02-23T15:35:22Z"],"scimCustomThird":3000},"externalId":"scimclient","userName":"userjson.add.username","name":{"givenName":"json","familyName":"json","middleName":"N/A","honorificPrefix":"N/A","honorificSuffix":"N/A"},"displayName":"json json","nickName":"json","profileUrl":"http://www.gluu.org/","emails":[{"value":"json@gluu.org","type":"work","primary":"true"},{"value":"json2@gluu.org","type":"home","primary":"false"}],"addresses":[{"type":"work","streetAddress":"621 East 6th Street Suite 200","locality":"Austin","region":"TX","postalCode":"78701","country":"US","formatted":"621 East 6th Street Suite 200  Austin , TX 78701 US","primary":"true"}],"phoneNumbers":[{"value":"646-345-2346","type":"work"}],"ims":[{"value":"nynytest_user","type":"Skype"}],"userType":"CEO","title":"CEO","preferredLanguage":"en-us","locale":"en_US","active":"true","password":"secret","roles":[{"value":"Owner"}],"entitlements":[{"value":"full access"}],"x509Certificates":[{"value":"MIIDQzCCAqygAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwTjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFDASBgNVBAoMC2V4YW1wbGUuY29tMRQwEgYDVQQDDAtleGFtcGxlLmNvbTAeFw0xMTEwMjIwNjI0MzFaFw0xMjEwMDQwNjI0MzFa MH8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRQwEgYDVQQKDAtleGFtcGxlLmNvbTEhMB8GA1UEAwwYTXMuIEJhcmJhcmEgSiBKZW5zZW4gSUlJMSIwIAYJKoZIhvcNAQkBFhNiamVuc2VuQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7Kr+Dcds/JQ5GwejJFcBIP682X3xpjis56AK02bc1FLgzdLI8auoR+cC9/Vrh5t66HkQIOdA4unHh0AaZ4xL5PhVbXIPMB5vAPKpzz5iPSi8xO8SL7I7SDhcBVJhqVqr3HgllEG6UClDdHO7nkLuwXq8HcISKkbT5WFTVfFZzidPl8HZ7DhXkZIRtJwBweq4bvm3hM1Os7UQH05ZS6cVDgweKNwdLLrT51ikSQG3DYrl+ft781UQRIqxgwqCfXEuDiinPh0kkvIi5jivVu1Z9QiwlYEdRbLJ4zJQBmDrSGTMYn4lRc2HgHO4DqB/bnMVorHB0CC6AV1QoFK4GPe1LwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU8pD0U0vsZIsaA16lL8En8bx0F/gwHwYDVR0jBBgwFoAUdGeKitcaF7gnzsNwDx708kqaVt0wDQYJKoZIhvcNAQEFBQADgYEAA81SsFnOdYJtNg5Tcq+/ByEDrBgnusx0jloUhByPMEVkoMZ3J7j1ZgI8rAbOkNngX8+pKfTiDz1RC4+dx8oU6Za+4NJXUjlL5CvV6BEYb1+QAEJwitTVvxB/A67g42/vzgAtoRUeDov1+GFiBZ+GNF/cAYKcMtGcrs2i97ZkJMo="}],"meta":{"created":"2010-01-23T04:56:22Z","lastModified":"2011-05-13T04:42:34Z","version":"aversion","location":"http://localhost:8080/identity/restv1/Users/8c4b6c26-efaf-4840-bddf-c0146a8eb2a9"}}
diff --git a/server/src/main/java/org/gluu/oxtrust/action/ManageCertificateAction.java b/server/src/main/java/org/gluu/oxtrust/action/ManageCertificateAction.java
@@ -98,7 +98,6 @@ public class ManageCertificateAction implements Serializable {
 	@Inject
 	private ApplianceService applianceService;
 
-	@SuppressWarnings("seam-unresolved-variable")
 	@Inject
 	protected GluuCustomPerson currentPerson;
 

diff --git a/server/src/main/java/org/gluu/oxtrust/action/UpdateGroupAction.java b/server/src/main/java/org/gluu/oxtrust/action/UpdateGroupAction.java
@@ -69,7 +69,6 @@ public class UpdateGroupAction implements Serializable {
 
 	private List<GluuCustomPerson> availableMembers;
 
-	@SuppressWarnings("seam-unresolved-variable")
 	@Inject
 	protected GluuCustomPerson currentPerson;
 

diff --git a/server/src/main/java/org/gluu/oxtrust/ldap/service/AppInitializer.java b/server/src/main/java/org/gluu/oxtrust/ldap/service/AppInitializer.java
@@ -67,9 +67,8 @@
 import java.util.logging.LogManager;
 
 /**
- * Perform startup time initialization. Provides factory methods for non Seam
- * components.
- * 
+ * Perform startup time initialization
+ *
  * @author Yuriy Movchan
  */
 @ApplicationScoped

diff --git a/server/src/main/java/org/gluu/oxtrust/ws/rs/scim/BulkWebService.java b/server/src/main/java/org/gluu/oxtrust/ws/rs/scim/BulkWebService.java
@@ -117,7 +117,7 @@ public Response bulkOperation(@Context HttpServletRequest request, @HeaderParam(
 						bulkResponses.setMethod(method);
 						GluuCustomPerson gluuPerson = personService.getPersonByUid(person.getUserName());
 						String iD = gluuPerson.getInum();
-						String location = (new StringBuilder()).append(domain).append("/oxTrust/seam/resource/restv1/Users/").append(iD)
+						String location = (new StringBuilder()).append(domain).append("/identity/restv1/Users/").append(iD)
 								.toString();
 						bulkResponses.setLocation(location);
 						BulkResponseStatus result = new BulkResponseStatus();
@@ -156,7 +156,7 @@ public Response bulkOperation(@Context HttpServletRequest request, @HeaderParam(
 						BulkResponses bulkResponses = new BulkResponses();
 						bulkResponses.setMethod(method);
 						String iD = personiD;
-						String location = (new StringBuilder()).append(domain).append("/oxTrust/seam/resource/restv1/Users/").append(iD)
+						String location = (new StringBuilder()).append(domain).append("/identity/restv1/Users/").append(iD)
 								.toString();
 						bulkResponses.setLocation(location);
 						EntityTag eTag = new EntityTag(version, true);
@@ -192,7 +192,7 @@ public Response bulkOperation(@Context HttpServletRequest request, @HeaderParam(
 
 						BulkResponses bulkResponses = new BulkResponses();
 						bulkResponses.setMethod(method);
-						String location = (new StringBuilder()).append(domain).append("/oxTrust/seam/resource/restv1/Users/")
+						String location = (new StringBuilder()).append(domain).append("/identity/restv1/Users/")
 								.append(personiD).toString();
 						bulkResponses.setLocation(location);
 						BulkResponseStatus result = new BulkResponseStatus();
@@ -233,7 +233,7 @@ public Response bulkOperation(@Context HttpServletRequest request, @HeaderParam(
 						bulkResponses.setMethod(method);
 						GluuGroup gluuGroup = groupService.getGroupByDisplayName(group.getDisplayName());
 						String iD = gluuGroup.getInum();
-						String location = (new StringBuilder()).append(domain).append("/oxTrust/seam/resource/restv1/Groups/").append(iD)
+						String location = (new StringBuilder()).append(domain).append("/identity/restv1/Groups/").append(iD)
 								.toString();
 						bulkResponses.setLocation(location);
 						BulkResponseStatus result = new BulkResponseStatus();
@@ -271,7 +271,7 @@ public Response bulkOperation(@Context HttpServletRequest request, @HeaderParam(
 						BulkResponses bulkResponses = new BulkResponses();
 						bulkResponses.setMethod(method);
 						String iD = groupiD;
-						String location = (new StringBuilder()).append(domain).append("/oxTrust/seam/resource/restv1/Groups/").append(iD)
+						String location = (new StringBuilder()).append(domain).append("/identity/restv1/Groups/").append(iD)
 								.toString();
 						bulkResponses.setLocation(location);
 						EntityTag eTag = new EntityTag(version, true);
@@ -307,7 +307,7 @@ public Response bulkOperation(@Context HttpServletRequest request, @HeaderParam(
 
 						BulkResponses bulkResponses = new BulkResponses();
 						bulkResponses.setMethod(method);
-						String location = (new StringBuilder()).append(domain).append("/oxTrust/seam/resource/restv1/Groups/")
+						String location = (new StringBuilder()).append(domain).append("/identity/restv1/Groups/")
 								.append(groupiD).toString();
 						bulkResponses.setLocation(location);
 						BulkResponseStatus result = new BulkResponseStatus();

diff --git a/server/src/main/resources/META-INF/navigation/addAttribute.navigation.xml b/server/src/main/resources/META-INF/navigation/addAttribute.navigation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.2" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
-  <rewrite pattern="/attribute/add" xmlns="http://jboss.org/schema/seam/pages"/>
+  <rewrite pattern="/attribute/add" xmlns="http://xmlns.gluu.org/jsf/pages"/>
   <navigation-rule>
     <from-view-id>/attribute/addAttribute.xhtml</from-view-id>
     <navigation-case>

diff --git a/server/src/main/resources/META-INF/navigation/addClient.navigation.xml b/server/src/main/resources/META-INF/navigation/addClient.navigation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.2" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
-  <rewrite pattern="/client/manage/add" xmlns="http://jboss.org/schema/seam/pages"/>
+  <rewrite pattern="/client/manage/add" xmlns="http://xmlns.gluu.org/jsf/pages"/>
   <navigation-rule>
     <from-view-id>/client/addClient.xhtml</from-view-id>
     <navigation-case>

diff --git a/server/src/main/resources/META-INF/navigation/addGroup.navigation.xml b/server/src/main/resources/META-INF/navigation/addGroup.navigation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.2" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
-  <rewrite pattern="/group/manage/add" xmlns="http://jboss.org/schema/seam/pages"/>
+  <rewrite pattern="/group/manage/add" xmlns="http://xmlns.gluu.org/jsf/pages"/>
   <navigation-rule>
     <from-view-id>/group/addGroup.xhtml</from-view-id>
     <navigation-case>

diff --git a/server/src/main/resources/META-INF/navigation/addIDPstep1.navigation.xml b/server/src/main/resources/META-INF/navigation/addIDPstep1.navigation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.2" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
-  <rewrite pattern="/asimba/addIDP" xmlns="http://jboss.org/schema/seam/pages"/>
+  <rewrite pattern="/asimba/addIDP" xmlns="http://xmlns.gluu.org/jsf/pages"/>
   <navigation-rule>
     <from-view-id>/asimba/addIDPstep1.xhtml</from-view-id>
     <navigation-case>

diff --git a/server/src/main/resources/META-INF/navigation/addPerson.navigation.xml b/server/src/main/resources/META-INF/navigation/addPerson.navigation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.2" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
-  <rewrite pattern="/person/add" xmlns="http://jboss.org/schema/seam/pages"/>
+  <rewrite pattern="/person/add" xmlns="http://xmlns.gluu.org/jsf/pages"/>
   <navigation-rule>
     <from-view-id>/person/addPerson.xhtml</from-view-id>
     <navigation-case>

diff --git a/server/src/main/resources/META-INF/navigation/addSPstep1.navigation.xml b/server/src/main/resources/META-INF/navigation/addSPstep1.navigation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.2" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
-  <rewrite pattern="/asimba/addSP" xmlns="http://jboss.org/schema/seam/pages"/>
+  <rewrite pattern="/asimba/addSP" xmlns="http://xmlns.gluu.org/jsf/pages"/>
   <navigation-rule>
     <from-view-id>/asimba/addSPstep1.xhtml</from-view-id>
     <navigation-case>