From 09254fb422f3858c886b670f97a47bed2f41d903 Mon Sep 17 00:00:00 2001 From: yurem Date: Wed, 21 Jun 2017 09:56:42 +0300 Subject: [PATCH] Simplify RestEasy endpoints URLs #594 --- README.md | 2 +- configuration/oxtrust-config.json | 2 +- .../config-oxtrust-test-data.properties | 2 +- .../setup/config-oxtrust-test-data.properties | 2 +- .../action/ManageCertificateAction.java | 1 - .../oxtrust/action/UpdateGroupAction.java | 1 - .../oxtrust/ldap/service/AppInitializer.java | 5 +- .../oxtrust/ws/rs/scim/BulkWebService.java | 12 +-- .../navigation/addAttribute.navigation.xml | 2 +- .../navigation/addClient.navigation.xml | 2 +- .../navigation/addGroup.navigation.xml | 2 +- .../navigation/addIDPstep1.navigation.xml | 2 +- .../navigation/addPerson.navigation.xml | 2 +- .../navigation/addSPstep1.navigation.xml | 2 +- .../navigation/addScope.navigation.xml | 2 +- .../addSectorIdentifier.navigation.xml | 2 +- .../addTrustRelationship.navigation.xml | 2 +- .../navigation/applianceStatus.navigation.xml | 2 +- .../applicationInventory.navigation.xml | 2 +- .../navigation/attributeExport.navigation.xml | 2 +- .../navigation/attributeImport.navigation.xml | 2 +- .../attributeInventory.navigation.xml | 2 +- .../authorizationCode.navigation.xml | 2 +- .../navigation/cacheRefresh.navigation.xml | 2 +- .../certificateManagement.navigation.xml | 2 +- .../navigation/clientInventory.navigation.xml | 2 +- .../configureLogViewer.navigation.xml | 2 +- .../navigation/deviceInventory.navigation.xml | 2 +- .../navigation/editIDP.navigation.xml | 2 +- .../navigation/editSPPool.navigation.xml | 2 +- .../navigation/editSPRequestor.navigation.xml | 2 +- .../navigation/editSelector.navigation.xml | 2 +- .../META-INF/navigation/error.navigation.xml | 2 +- .../navigation/error_service.navigation.xml | 2 +- .../navigation/finishlogin.navigation.xml | 2 +- .../navigation/finishlogout.navigation.xml | 2 +- .../getAuthorizationCode.navigation.xml | 2 +- .../navigation/groupInventory.navigation.xml | 2 +- .../META-INF/navigation/home.navigation.xml | 2 +- .../META-INF/navigation/idps.navigation.xml | 2 +- .../navigation/inventory.navigation.xml | 2 +- .../navigation/linktrack.navigation.xml | 2 +- .../META-INF/navigation/login.navigation.xml | 2 +- .../META-INF/navigation/logout.navigation.xml | 2 +- .../manageCustomAuthentication.navigation.xml | 2 +- .../manageCustomScript.navigation.xml | 2 +- .../manageRegistration.navigation.xml | 2 +- .../modifyResourceSet.navigation.xml | 2 +- .../modifyScopeDescription.navigation.xml | 2 +- .../passwordReminder.navigation.xml | 2 +- .../navigation/personImport.navigation.xml | 2 +- .../navigation/personInventory.navigation.xml | 2 +- .../navigation/postRegister.navigation.xml | 2 +- .../navigation/register.navigation.xml | 2 +- .../navigation/resetPassword.navigation.xml | 2 +- .../resetPasswordSuccess.navigation.xml | 2 +- .../navigation/resource.navigation.xml | 2 +- .../META-INF/navigation/scope.navigation.xml | 2 +- .../scopeDescriptionFile.navigation.xml | 2 +- .../scopeDescriptionIcon.navigation.xml | 2 +- .../navigation/scopeInventory.navigation.xml | 2 +- .../sectorIdentifierInventory.navigation.xml | 2 +- .../navigation/selectors.navigation.xml | 2 +- .../navigation/spPools.navigation.xml | 2 +- .../navigation/spRequestors.navigation.xml | 2 +- .../META-INF/navigation/status.navigation.xml | 2 +- ...lationshipConfigurationFile.navigation.xml | 2 +- .../trustRelationships.navigation.xml | 2 +- .../navigation/updateAttribute.navigation.xml | 2 +- .../navigation/updateClient.navigation.xml | 2 +- .../updateConfiguration.navigation.xml | 2 +- .../navigation/updateGroup.navigation.xml | 2 +- .../updateOrganization.navigation.xml | 2 +- .../navigation/updatePerson.navigation.xml | 2 +- .../navigation/updateScope.navigation.xml | 2 +- .../updateSectorIdentifier.navigation.xml | 2 +- .../updateTrustRelationship.navigation.xml | 2 +- .../navigation/viewLogFile.navigation.xml | 2 +- .../navigation/viewProfile.navigation.xml | 2 +- .../navigation/viewWhitePages.navigation.xml | 2 +- server/src/main/webapp/WEB-INF/components.xml | 88 ------------------ .../WEB-INF/incl/person/personForm.xhtml | 3 - .../person/configureListingOptions.xhtml | 3 - .../service/test/UserExtensionsTest.java | 2 +- .../src/test/resources/WEB-INF/components.xml | 89 ------------------- server/src/test/resources/components.xml | 20 ----- server/src/test/resources/web.xml | 2 +- 87 files changed, 86 insertions(+), 292 deletions(-) delete mode 100644 server/src/main/webapp/WEB-INF/components.xml delete mode 100644 server/src/test/resources/WEB-INF/components.xml delete mode 100644 server/src/test/resources/components.xml diff --git a/README.md b/README.md index cd94e4040..0589793e3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ oxTrust ====== -

oxTrust is a JBoss Seam web application for oxAuth administration, and for configuring inter-domain trust management. +

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.

oxTrust is tightly coupled with oxAuth. 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.

Refer to https://github.com/GluuFederation/install for installation instructions.

diff --git a/configuration/oxtrust-config.json b/configuration/oxtrust-config.json index 179b5684d..b17ba068e 100644 --- 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 index cbe5ed8e5..87b979b97 100644 --- 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 index e0bda3559..8e7a9fa09 100644 --- 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 index 9d539ff0e..c21a13fb4 100644 --- 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 index ed5205b48..2232fd2bc 100644 --- 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 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 index 0c402958c..f72c74a49 100644 --- 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 index fad8cafcb..9fdfbb35c 100644 --- 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 index 1fac325d4..45407690a 100644 --- 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 @@ - + /attribute/addAttribute.xhtml diff --git a/server/src/main/resources/META-INF/navigation/addClient.navigation.xml b/server/src/main/resources/META-INF/navigation/addClient.navigation.xml index 676e44334..6d2444c2c 100644 --- 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 @@ - + /client/addClient.xhtml diff --git a/server/src/main/resources/META-INF/navigation/addGroup.navigation.xml b/server/src/main/resources/META-INF/navigation/addGroup.navigation.xml index 6b4c8b89f..f16cf5523 100644 --- 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 @@ - + /group/addGroup.xhtml diff --git a/server/src/main/resources/META-INF/navigation/addIDPstep1.navigation.xml b/server/src/main/resources/META-INF/navigation/addIDPstep1.navigation.xml index 96839f4de..f20f204df 100644 --- 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 @@ - + /asimba/addIDPstep1.xhtml diff --git a/server/src/main/resources/META-INF/navigation/addPerson.navigation.xml b/server/src/main/resources/META-INF/navigation/addPerson.navigation.xml index 57db75050..c0f64ea11 100644 --- 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 @@ - + /person/addPerson.xhtml diff --git a/server/src/main/resources/META-INF/navigation/addSPstep1.navigation.xml b/server/src/main/resources/META-INF/navigation/addSPstep1.navigation.xml index d3d311163..f4bf3f0be 100644 --- 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 @@ - + /asimba/addSPstep1.xhtml diff --git a/server/src/main/resources/META-INF/navigation/addScope.navigation.xml b/server/src/main/resources/META-INF/navigation/addScope.navigation.xml index 32ffe6b8a..4d5cd77e8 100644 --- a/server/src/main/resources/META-INF/navigation/addScope.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/addScope.navigation.xml @@ -1,6 +1,6 @@ - + /scope/addScope.xhtml diff --git a/server/src/main/resources/META-INF/navigation/addSectorIdentifier.navigation.xml b/server/src/main/resources/META-INF/navigation/addSectorIdentifier.navigation.xml index 3dc9a3394..5cffb35d2 100644 --- a/server/src/main/resources/META-INF/navigation/addSectorIdentifier.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/addSectorIdentifier.navigation.xml @@ -1,6 +1,6 @@ - + /sectoridentifier/addSectorIdentifier.xhtml diff --git a/server/src/main/resources/META-INF/navigation/addTrustRelationship.navigation.xml b/server/src/main/resources/META-INF/navigation/addTrustRelationship.navigation.xml index e7587ffd9..d5389d504 100644 --- a/server/src/main/resources/META-INF/navigation/addTrustRelationship.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/addTrustRelationship.navigation.xml @@ -1,6 +1,6 @@ - + /trustmanager/addTrustRelationship.xhtml diff --git a/server/src/main/resources/META-INF/navigation/applianceStatus.navigation.xml b/server/src/main/resources/META-INF/navigation/applianceStatus.navigation.xml index 98b9e9b50..dd1a54898 100644 --- a/server/src/main/resources/META-INF/navigation/applianceStatus.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/applianceStatus.navigation.xml @@ -1,4 +1,4 @@ - + diff --git a/server/src/main/resources/META-INF/navigation/applicationInventory.navigation.xml b/server/src/main/resources/META-INF/navigation/applicationInventory.navigation.xml index fe670b12b..2a1855ec2 100644 --- a/server/src/main/resources/META-INF/navigation/applicationInventory.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/applicationInventory.navigation.xml @@ -1,6 +1,6 @@ - + /push/application/applicationInventory.xhtml diff --git a/server/src/main/resources/META-INF/navigation/attributeExport.navigation.xml b/server/src/main/resources/META-INF/navigation/attributeExport.navigation.xml index 1256f79f2..8248e368f 100644 --- a/server/src/main/resources/META-INF/navigation/attributeExport.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/attributeExport.navigation.xml @@ -1,6 +1,6 @@ - + /attribute/attributeExport.xhtml diff --git a/server/src/main/resources/META-INF/navigation/attributeImport.navigation.xml b/server/src/main/resources/META-INF/navigation/attributeImport.navigation.xml index 6b8a90579..2ec041a2d 100644 --- a/server/src/main/resources/META-INF/navigation/attributeImport.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/attributeImport.navigation.xml @@ -1,6 +1,6 @@ - + /attribute/attributeImport.xhtml diff --git a/server/src/main/resources/META-INF/navigation/attributeInventory.navigation.xml b/server/src/main/resources/META-INF/navigation/attributeInventory.navigation.xml index d447c383d..4ee73855b 100644 --- a/server/src/main/resources/META-INF/navigation/attributeInventory.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/attributeInventory.navigation.xml @@ -1,6 +1,6 @@ - + /attribute/attributeInventory.xhtml diff --git a/server/src/main/resources/META-INF/navigation/authorizationCode.navigation.xml b/server/src/main/resources/META-INF/navigation/authorizationCode.navigation.xml index e7ebf6534..bfb30a387 100644 --- a/server/src/main/resources/META-INF/navigation/authorizationCode.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/authorizationCode.navigation.xml @@ -1,4 +1,4 @@ - + diff --git a/server/src/main/resources/META-INF/navigation/cacheRefresh.navigation.xml b/server/src/main/resources/META-INF/navigation/cacheRefresh.navigation.xml index e3c173df4..419b56d44 100644 --- a/server/src/main/resources/META-INF/navigation/cacheRefresh.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/cacheRefresh.navigation.xml @@ -1,6 +1,6 @@ - + /organization/cacheRefresh.xhtml diff --git a/server/src/main/resources/META-INF/navigation/certificateManagement.navigation.xml b/server/src/main/resources/META-INF/navigation/certificateManagement.navigation.xml index 7f6c9b84a..bcc805cc3 100644 --- a/server/src/main/resources/META-INF/navigation/certificateManagement.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/certificateManagement.navigation.xml @@ -1,6 +1,6 @@ - + /configuration/certificateManagement.xhtml diff --git a/server/src/main/resources/META-INF/navigation/clientInventory.navigation.xml b/server/src/main/resources/META-INF/navigation/clientInventory.navigation.xml index 50892f134..053cbbc44 100644 --- a/server/src/main/resources/META-INF/navigation/clientInventory.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/clientInventory.navigation.xml @@ -1,6 +1,6 @@ - + /client/clientInventory.xhtml diff --git a/server/src/main/resources/META-INF/navigation/configureLogViewer.navigation.xml b/server/src/main/resources/META-INF/navigation/configureLogViewer.navigation.xml index c92aa5f6c..655e919ca 100644 --- a/server/src/main/resources/META-INF/navigation/configureLogViewer.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/configureLogViewer.navigation.xml @@ -1,6 +1,6 @@ - + /logviewer/configureLogViewer.xhtml diff --git a/server/src/main/resources/META-INF/navigation/deviceInventory.navigation.xml b/server/src/main/resources/META-INF/navigation/deviceInventory.navigation.xml index 5a1ef1c8f..d4547866c 100644 --- a/server/src/main/resources/META-INF/navigation/deviceInventory.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/deviceInventory.navigation.xml @@ -1,6 +1,6 @@ - + /push/device/deviceInventory.xhtml diff --git a/server/src/main/resources/META-INF/navigation/editIDP.navigation.xml b/server/src/main/resources/META-INF/navigation/editIDP.navigation.xml index fd0fff682..6f5b55bca 100644 --- a/server/src/main/resources/META-INF/navigation/editIDP.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/editIDP.navigation.xml @@ -1,6 +1,6 @@ - + /asimba/editIDP.xhtml diff --git a/server/src/main/resources/META-INF/navigation/editSPPool.navigation.xml b/server/src/main/resources/META-INF/navigation/editSPPool.navigation.xml index fad2cd7e5..f6556d3c0 100644 --- a/server/src/main/resources/META-INF/navigation/editSPPool.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/editSPPool.navigation.xml @@ -1,6 +1,6 @@ - + /asimba/editSPPool.xhtml diff --git a/server/src/main/resources/META-INF/navigation/editSPRequestor.navigation.xml b/server/src/main/resources/META-INF/navigation/editSPRequestor.navigation.xml index 7d9e7f006..a944b140d 100644 --- a/server/src/main/resources/META-INF/navigation/editSPRequestor.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/editSPRequestor.navigation.xml @@ -1,6 +1,6 @@ - + /asimba/editSPRequestor.xhtml diff --git a/server/src/main/resources/META-INF/navigation/editSelector.navigation.xml b/server/src/main/resources/META-INF/navigation/editSelector.navigation.xml index 3536cf37e..776b3744a 100644 --- a/server/src/main/resources/META-INF/navigation/editSelector.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/editSelector.navigation.xml @@ -1,6 +1,6 @@ - + /asimba/editSelector.xhtml diff --git a/server/src/main/resources/META-INF/navigation/error.navigation.xml b/server/src/main/resources/META-INF/navigation/error.navigation.xml index db2edadc9..277a46c19 100644 --- a/server/src/main/resources/META-INF/navigation/error.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/error.navigation.xml @@ -1,4 +1,4 @@ - + diff --git a/server/src/main/resources/META-INF/navigation/error_service.navigation.xml b/server/src/main/resources/META-INF/navigation/error_service.navigation.xml index 109f0bd89..bea69f2cb 100644 --- a/server/src/main/resources/META-INF/navigation/error_service.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/error_service.navigation.xml @@ -1,4 +1,4 @@ - + diff --git a/server/src/main/resources/META-INF/navigation/finishlogin.navigation.xml b/server/src/main/resources/META-INF/navigation/finishlogin.navigation.xml index 5f522df1d..affdf00f0 100644 --- a/server/src/main/resources/META-INF/navigation/finishlogin.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/finishlogin.navigation.xml @@ -1,6 +1,6 @@ - + /finishlogin.xhtml diff --git a/server/src/main/resources/META-INF/navigation/finishlogout.navigation.xml b/server/src/main/resources/META-INF/navigation/finishlogout.navigation.xml index e4981d944..62c84220f 100644 --- a/server/src/main/resources/META-INF/navigation/finishlogout.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/finishlogout.navigation.xml @@ -1,6 +1,6 @@ - + /finishlogout.xhtml diff --git a/server/src/main/resources/META-INF/navigation/getAuthorizationCode.navigation.xml b/server/src/main/resources/META-INF/navigation/getAuthorizationCode.navigation.xml index 6053ec297..73bd02580 100644 --- a/server/src/main/resources/META-INF/navigation/getAuthorizationCode.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/getAuthorizationCode.navigation.xml @@ -1,6 +1,6 @@ - + /getAuthorizationCode.xhtml diff --git a/server/src/main/resources/META-INF/navigation/groupInventory.navigation.xml b/server/src/main/resources/META-INF/navigation/groupInventory.navigation.xml index 110b7e3c3..0827c7d47 100644 --- a/server/src/main/resources/META-INF/navigation/groupInventory.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/groupInventory.navigation.xml @@ -1,6 +1,6 @@ - + /group/groupInventory.xhtml diff --git a/server/src/main/resources/META-INF/navigation/home.navigation.xml b/server/src/main/resources/META-INF/navigation/home.navigation.xml index 686c1e35f..e29e31206 100644 --- a/server/src/main/resources/META-INF/navigation/home.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/home.navigation.xml @@ -1,4 +1,4 @@ - + diff --git a/server/src/main/resources/META-INF/navigation/idps.navigation.xml b/server/src/main/resources/META-INF/navigation/idps.navigation.xml index cb1b51727..30afc823e 100644 --- a/server/src/main/resources/META-INF/navigation/idps.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/idps.navigation.xml @@ -1,6 +1,6 @@ - + /asimba/idps.xhtml diff --git a/server/src/main/resources/META-INF/navigation/inventory.navigation.xml b/server/src/main/resources/META-INF/navigation/inventory.navigation.xml index d7eb736c9..adf52b3dc 100644 --- a/server/src/main/resources/META-INF/navigation/inventory.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/inventory.navigation.xml @@ -1,6 +1,6 @@ - + /uma/inventory.xhtml diff --git a/server/src/main/resources/META-INF/navigation/linktrack.navigation.xml b/server/src/main/resources/META-INF/navigation/linktrack.navigation.xml index d7412070c..6ea913bce 100644 --- a/server/src/main/resources/META-INF/navigation/linktrack.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/linktrack.navigation.xml @@ -1,6 +1,6 @@ - + /apis/linktrack.xhtml diff --git a/server/src/main/resources/META-INF/navigation/login.navigation.xml b/server/src/main/resources/META-INF/navigation/login.navigation.xml index f5d9adf2d..66f0696ee 100644 --- a/server/src/main/resources/META-INF/navigation/login.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/login.navigation.xml @@ -1,6 +1,6 @@ - + /login.xhtml diff --git a/server/src/main/resources/META-INF/navigation/logout.navigation.xml b/server/src/main/resources/META-INF/navigation/logout.navigation.xml index 63f0b8e54..677d3044f 100644 --- a/server/src/main/resources/META-INF/navigation/logout.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/logout.navigation.xml @@ -1,6 +1,6 @@ - + /logout.xhtml diff --git a/server/src/main/resources/META-INF/navigation/manageCustomAuthentication.navigation.xml b/server/src/main/resources/META-INF/navigation/manageCustomAuthentication.navigation.xml index 88047b0da..1c09c2dd3 100644 --- a/server/src/main/resources/META-INF/navigation/manageCustomAuthentication.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/manageCustomAuthentication.navigation.xml @@ -1,6 +1,6 @@ - + /authentication/manageCustomAuthentication.xhtml diff --git a/server/src/main/resources/META-INF/navigation/manageCustomScript.navigation.xml b/server/src/main/resources/META-INF/navigation/manageCustomScript.navigation.xml index c8b1d3087..17e0108ca 100644 --- a/server/src/main/resources/META-INF/navigation/manageCustomScript.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/manageCustomScript.navigation.xml @@ -1,6 +1,6 @@ - + /script/manageCustomScript.xhtml diff --git a/server/src/main/resources/META-INF/navigation/manageRegistration.navigation.xml b/server/src/main/resources/META-INF/navigation/manageRegistration.navigation.xml index 34ee29d30..fdd5b5ca8 100644 --- a/server/src/main/resources/META-INF/navigation/manageRegistration.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/manageRegistration.navigation.xml @@ -1,6 +1,6 @@ - + /organization/manageRegistration.xhtml diff --git a/server/src/main/resources/META-INF/navigation/modifyResourceSet.navigation.xml b/server/src/main/resources/META-INF/navigation/modifyResourceSet.navigation.xml index 03f65c195..6fccfafe2 100644 --- a/server/src/main/resources/META-INF/navigation/modifyResourceSet.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/modifyResourceSet.navigation.xml @@ -1,6 +1,6 @@ - + /uma/resource/modifyResourceSet.xhtml diff --git a/server/src/main/resources/META-INF/navigation/modifyScopeDescription.navigation.xml b/server/src/main/resources/META-INF/navigation/modifyScopeDescription.navigation.xml index fc7bee42d..ea25b4293 100644 --- a/server/src/main/resources/META-INF/navigation/modifyScopeDescription.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/modifyScopeDescription.navigation.xml @@ -1,6 +1,6 @@ - + /uma/scope/modifyScopeDescription.xhtml diff --git a/server/src/main/resources/META-INF/navigation/passwordReminder.navigation.xml b/server/src/main/resources/META-INF/navigation/passwordReminder.navigation.xml index 1d7686451..5dcf26107 100644 --- a/server/src/main/resources/META-INF/navigation/passwordReminder.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/passwordReminder.navigation.xml @@ -1,6 +1,6 @@ - + /person/passwordReminder.xhtml diff --git a/server/src/main/resources/META-INF/navigation/personImport.navigation.xml b/server/src/main/resources/META-INF/navigation/personImport.navigation.xml index 014a1d793..feca67e6d 100644 --- a/server/src/main/resources/META-INF/navigation/personImport.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/personImport.navigation.xml @@ -1,6 +1,6 @@ - + /person/personImport.xhtml diff --git a/server/src/main/resources/META-INF/navigation/personInventory.navigation.xml b/server/src/main/resources/META-INF/navigation/personInventory.navigation.xml index fa6dd9185..4ac52bc24 100644 --- a/server/src/main/resources/META-INF/navigation/personInventory.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/personInventory.navigation.xml @@ -1,6 +1,6 @@ - + /person/personInventory.xhtml diff --git a/server/src/main/resources/META-INF/navigation/postRegister.navigation.xml b/server/src/main/resources/META-INF/navigation/postRegister.navigation.xml index b21fce3c3..8238e3964 100644 --- a/server/src/main/resources/META-INF/navigation/postRegister.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/postRegister.navigation.xml @@ -1,4 +1,4 @@ - + diff --git a/server/src/main/resources/META-INF/navigation/register.navigation.xml b/server/src/main/resources/META-INF/navigation/register.navigation.xml index 5014a5219..d1df9bc2b 100644 --- a/server/src/main/resources/META-INF/navigation/register.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/register.navigation.xml @@ -1,6 +1,6 @@ - + /register.xhtml diff --git a/server/src/main/resources/META-INF/navigation/resetPassword.navigation.xml b/server/src/main/resources/META-INF/navigation/resetPassword.navigation.xml index a06db4f1a..5062d04fe 100644 --- a/server/src/main/resources/META-INF/navigation/resetPassword.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/resetPassword.navigation.xml @@ -1,6 +1,6 @@ - + /resetPassword.xhtml diff --git a/server/src/main/resources/META-INF/navigation/resetPasswordSuccess.navigation.xml b/server/src/main/resources/META-INF/navigation/resetPasswordSuccess.navigation.xml index 82be4199f..1d7bee3c1 100644 --- a/server/src/main/resources/META-INF/navigation/resetPasswordSuccess.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/resetPasswordSuccess.navigation.xml @@ -1,4 +1,4 @@ - + diff --git a/server/src/main/resources/META-INF/navigation/resource.navigation.xml b/server/src/main/resources/META-INF/navigation/resource.navigation.xml index 4a885513f..a00b6c9b1 100644 --- a/server/src/main/resources/META-INF/navigation/resource.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/resource.navigation.xml @@ -1,6 +1,6 @@ - + /uma/resource.xhtml diff --git a/server/src/main/resources/META-INF/navigation/scope.navigation.xml b/server/src/main/resources/META-INF/navigation/scope.navigation.xml index 16f835f5e..9a07feb19 100644 --- a/server/src/main/resources/META-INF/navigation/scope.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/scope.navigation.xml @@ -1,6 +1,6 @@ - + /uma/scope.xhtml diff --git a/server/src/main/resources/META-INF/navigation/scopeDescriptionFile.navigation.xml b/server/src/main/resources/META-INF/navigation/scopeDescriptionFile.navigation.xml index 8706e2a2d..618b8a3d4 100644 --- a/server/src/main/resources/META-INF/navigation/scopeDescriptionFile.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/scopeDescriptionFile.navigation.xml @@ -1,4 +1,4 @@ - + diff --git a/server/src/main/resources/META-INF/navigation/scopeDescriptionIcon.navigation.xml b/server/src/main/resources/META-INF/navigation/scopeDescriptionIcon.navigation.xml index 27f672fe0..8e214ead8 100644 --- a/server/src/main/resources/META-INF/navigation/scopeDescriptionIcon.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/scopeDescriptionIcon.navigation.xml @@ -1,4 +1,4 @@ - + diff --git a/server/src/main/resources/META-INF/navigation/scopeInventory.navigation.xml b/server/src/main/resources/META-INF/navigation/scopeInventory.navigation.xml index 7af8d1953..2d89e3b49 100644 --- a/server/src/main/resources/META-INF/navigation/scopeInventory.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/scopeInventory.navigation.xml @@ -1,6 +1,6 @@ - + /scope/scopeInventory.xhtml diff --git a/server/src/main/resources/META-INF/navigation/sectorIdentifierInventory.navigation.xml b/server/src/main/resources/META-INF/navigation/sectorIdentifierInventory.navigation.xml index 8a39b2c1f..da6c75d56 100644 --- a/server/src/main/resources/META-INF/navigation/sectorIdentifierInventory.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/sectorIdentifierInventory.navigation.xml @@ -1,6 +1,6 @@ - + /sectoridentifier/sectorIdentifierInventory.xhtml diff --git a/server/src/main/resources/META-INF/navigation/selectors.navigation.xml b/server/src/main/resources/META-INF/navigation/selectors.navigation.xml index 3682d471e..6e3694e26 100644 --- a/server/src/main/resources/META-INF/navigation/selectors.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/selectors.navigation.xml @@ -1,6 +1,6 @@ - + /asimba/selectors.xhtml diff --git a/server/src/main/resources/META-INF/navigation/spPools.navigation.xml b/server/src/main/resources/META-INF/navigation/spPools.navigation.xml index b2f59ad67..a13a507af 100644 --- a/server/src/main/resources/META-INF/navigation/spPools.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/spPools.navigation.xml @@ -1,6 +1,6 @@ - + /asimba/spPools.xhtml diff --git a/server/src/main/resources/META-INF/navigation/spRequestors.navigation.xml b/server/src/main/resources/META-INF/navigation/spRequestors.navigation.xml index f132a4d51..2253aaab8 100644 --- a/server/src/main/resources/META-INF/navigation/spRequestors.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/spRequestors.navigation.xml @@ -1,6 +1,6 @@ - + /asimba/spRequestors.xhtml diff --git a/server/src/main/resources/META-INF/navigation/status.navigation.xml b/server/src/main/resources/META-INF/navigation/status.navigation.xml index 874dd9522..1b5cd008c 100644 --- a/server/src/main/resources/META-INF/navigation/status.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/status.navigation.xml @@ -1,4 +1,4 @@ - + diff --git a/server/src/main/resources/META-INF/navigation/trustRelationshipConfigurationFile.navigation.xml b/server/src/main/resources/META-INF/navigation/trustRelationshipConfigurationFile.navigation.xml index 4ce1623fd..d2b17aff7 100644 --- a/server/src/main/resources/META-INF/navigation/trustRelationshipConfigurationFile.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/trustRelationshipConfigurationFile.navigation.xml @@ -1,6 +1,6 @@ - + /trustmanager/trustRelationshipConfigurationFile.xhtml diff --git a/server/src/main/resources/META-INF/navigation/trustRelationships.navigation.xml b/server/src/main/resources/META-INF/navigation/trustRelationships.navigation.xml index 6f043c982..c9c2d2360 100644 --- a/server/src/main/resources/META-INF/navigation/trustRelationships.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/trustRelationships.navigation.xml @@ -1,6 +1,6 @@ - + /trustmanager/trustRelationships.xhtml diff --git a/server/src/main/resources/META-INF/navigation/updateAttribute.navigation.xml b/server/src/main/resources/META-INF/navigation/updateAttribute.navigation.xml index b5c6aac37..2d15c8ce9 100644 --- a/server/src/main/resources/META-INF/navigation/updateAttribute.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/updateAttribute.navigation.xml @@ -1,6 +1,6 @@ - + /attribute/updateAttribute.xhtml diff --git a/server/src/main/resources/META-INF/navigation/updateClient.navigation.xml b/server/src/main/resources/META-INF/navigation/updateClient.navigation.xml index 371a89528..05c5f5ef8 100644 --- a/server/src/main/resources/META-INF/navigation/updateClient.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/updateClient.navigation.xml @@ -1,6 +1,6 @@ - + /client/updateClient.xhtml diff --git a/server/src/main/resources/META-INF/navigation/updateConfiguration.navigation.xml b/server/src/main/resources/META-INF/navigation/updateConfiguration.navigation.xml index 798e68d48..e315504e8 100644 --- a/server/src/main/resources/META-INF/navigation/updateConfiguration.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/updateConfiguration.navigation.xml @@ -1,6 +1,6 @@ - + /configuration/updateConfiguration.xhtml diff --git a/server/src/main/resources/META-INF/navigation/updateGroup.navigation.xml b/server/src/main/resources/META-INF/navigation/updateGroup.navigation.xml index 09e786a5b..25cef15a2 100644 --- a/server/src/main/resources/META-INF/navigation/updateGroup.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/updateGroup.navigation.xml @@ -1,6 +1,6 @@ - + /group/updateGroup.xhtml diff --git a/server/src/main/resources/META-INF/navigation/updateOrganization.navigation.xml b/server/src/main/resources/META-INF/navigation/updateOrganization.navigation.xml index 295b7830e..69f81771b 100644 --- a/server/src/main/resources/META-INF/navigation/updateOrganization.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/updateOrganization.navigation.xml @@ -1,6 +1,6 @@ - + /organization/updateOrganization.xhtml diff --git a/server/src/main/resources/META-INF/navigation/updatePerson.navigation.xml b/server/src/main/resources/META-INF/navigation/updatePerson.navigation.xml index 50773a680..4258cb27c 100644 --- a/server/src/main/resources/META-INF/navigation/updatePerson.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/updatePerson.navigation.xml @@ -1,6 +1,6 @@ - + /person/updatePerson.xhtml diff --git a/server/src/main/resources/META-INF/navigation/updateScope.navigation.xml b/server/src/main/resources/META-INF/navigation/updateScope.navigation.xml index 2aacf7168..4d48ae623 100644 --- a/server/src/main/resources/META-INF/navigation/updateScope.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/updateScope.navigation.xml @@ -1,6 +1,6 @@ - + /scope/updateScope.xhtml diff --git a/server/src/main/resources/META-INF/navigation/updateSectorIdentifier.navigation.xml b/server/src/main/resources/META-INF/navigation/updateSectorIdentifier.navigation.xml index 286d7e47f..6a657bc07 100644 --- a/server/src/main/resources/META-INF/navigation/updateSectorIdentifier.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/updateSectorIdentifier.navigation.xml @@ -1,6 +1,6 @@ - + /sectoridentifier/updateSectorIdentifier.xhtml diff --git a/server/src/main/resources/META-INF/navigation/updateTrustRelationship.navigation.xml b/server/src/main/resources/META-INF/navigation/updateTrustRelationship.navigation.xml index b654c931b..4cb981de1 100644 --- a/server/src/main/resources/META-INF/navigation/updateTrustRelationship.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/updateTrustRelationship.navigation.xml @@ -1,6 +1,6 @@ - + /trustmanager/updateTrustRelationship.xhtml diff --git a/server/src/main/resources/META-INF/navigation/viewLogFile.navigation.xml b/server/src/main/resources/META-INF/navigation/viewLogFile.navigation.xml index 5dbfaf269..0726fa251 100644 --- a/server/src/main/resources/META-INF/navigation/viewLogFile.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/viewLogFile.navigation.xml @@ -1,6 +1,6 @@ - + /logviewer/viewLogFile.xhtml diff --git a/server/src/main/resources/META-INF/navigation/viewProfile.navigation.xml b/server/src/main/resources/META-INF/navigation/viewProfile.navigation.xml index d4cc3e037..efa991ec5 100644 --- a/server/src/main/resources/META-INF/navigation/viewProfile.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/viewProfile.navigation.xml @@ -1,6 +1,6 @@ - + /profile/person/viewProfile.xhtml diff --git a/server/src/main/resources/META-INF/navigation/viewWhitePages.navigation.xml b/server/src/main/resources/META-INF/navigation/viewWhitePages.navigation.xml index 71eac197a..a7d80e31a 100644 --- a/server/src/main/resources/META-INF/navigation/viewWhitePages.navigation.xml +++ b/server/src/main/resources/META-INF/navigation/viewWhitePages.navigation.xml @@ -1,6 +1,6 @@ - + /whitePage/viewWhitePages.xhtml diff --git a/server/src/main/webapp/WEB-INF/components.xml b/server/src/main/webapp/WEB-INF/components.xml deleted file mode 100644 index 5c8ff149d..000000000 --- a/server/src/main/webapp/WEB-INF/components.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - ${buildNumber} - ${git.commit.time} - ${buildDate} - ${env.BUILD_NUMBER} - - - - - - - - - - - - - - - - - - /security.drl - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/src/main/webapp/WEB-INF/incl/person/personForm.xhtml b/server/src/main/webapp/WEB-INF/incl/person/personForm.xhtml index f8447d77b..e5e375562 100644 --- a/server/src/main/webapp/WEB-INF/incl/person/personForm.xhtml +++ b/server/src/main/webapp/WEB-INF/incl/person/personForm.xhtml @@ -96,9 +96,6 @@
- - diff --git a/server/src/main/webapp/WEB-INF/incl/profile/person/configureListingOptions.xhtml b/server/src/main/webapp/WEB-INF/incl/profile/person/configureListingOptions.xhtml index 9f45847c3..e06b1f4af 100644 --- a/server/src/main/webapp/WEB-INF/incl/profile/person/configureListingOptions.xhtml +++ b/server/src/main/webapp/WEB-INF/incl/profile/person/configureListingOptions.xhtml @@ -11,9 +11,6 @@ - - - diff --git a/server/src/test/java/org/gluu/oxtrust/service/test/UserExtensionsTest.java b/server/src/test/java/org/gluu/oxtrust/service/test/UserExtensionsTest.java index 555c67fde..e60c98ab0 100644 --- a/server/src/test/java/org/gluu/oxtrust/service/test/UserExtensionsTest.java +++ b/server/src/test/java/org/gluu/oxtrust/service/test/UserExtensionsTest.java @@ -103,7 +103,7 @@ public void testCreatePersonFromJsonString(final String createJson) throws Excep // 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\"}}"; + // 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\"}}"; ObjectMapper mapper = new ObjectMapper(); mapper.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES); diff --git a/server/src/test/resources/WEB-INF/components.xml b/server/src/test/resources/WEB-INF/components.xml deleted file mode 100644 index 117f596db..000000000 --- a/server/src/test/resources/WEB-INF/components.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - ${buildNumber} - ${git.commit.time} - ${buildDate} - ${env.BUILD_NUMBER} - - - - - - - - - - - - - - - - - - /security.drl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/src/test/resources/components.xml b/server/src/test/resources/components.xml deleted file mode 100644 index ecaec72fc..000000000 --- a/server/src/test/resources/components.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/server/src/test/resources/web.xml b/server/src/test/resources/web.xml index 13859d4e7..0f2e62918 100644 --- a/server/src/test/resources/web.xml +++ b/server/src/test/resources/web.xml @@ -17,7 +17,7 @@ resteasy.servlet.mapping.prefix - /seam/resource/restv1 + /restv1