merge from master
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/77fc5d26 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/77fc5d26 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/77fc5d26 Branch: refs/heads/SYNCOPE-156 Commit: 77fc5d26b01f4b56fad131e5c6190103a161e77c Parents: ee7ca34 714557e Author: fmartelli <[email protected]> Authored: Fri Oct 30 11:21:36 2015 +0100 Committer: fmartelli <[email protected]> Committed: Fri Oct 30 11:21:36 2015 +0100 ---------------------------------------------------------------------- .travis.yml | 2 - .../org/apache/syncope/client/cli/Input.java | 6 + .../apache/syncope/client/cli/SyncopeAdm.java | 7 +- .../cli/commands/CommonsResultManager.java | 15 +- .../AbstractConfigurationCommand.java | 6 +- .../configuration/ConfigurationCommand.java | 2 +- .../configuration/ConfigurationDelete.java | 7 +- .../configuration/ConfigurationExport.java | 14 +- .../configuration/ConfigurationGet.java | 21 +- .../configuration/ConfigurationRead.java | 5 +- .../ConfigurationSyncopeOperations.java | 50 ++ .../configuration/ConfigurationUpdate.java | 11 +- .../connector/AbstractConnectorCommand.java | 5 +- .../commands/connector/ConnectorCommand.java | 4 +- .../cli/commands/connector/ConnectorDelete.java | 9 +- .../cli/commands/connector/ConnectorList.java | 21 +- .../connector/ConnectorListBundles.java | 21 +- .../ConnectorListConfigurationProperties.java | 12 +- .../cli/commands/connector/ConnectorRead.java | 13 +- .../connector/ConnectorReadByResource.java | 11 +- .../connector/ConnectorResultManager.java | 42 +- .../connector/ConnectorSyncopeOperations.java | 50 ++ .../commands/domain/AbstractDomainCommand.java | 5 +- .../cli/commands/domain/DomainCommand.java | 4 +- .../cli/commands/domain/DomainDelete.java | 7 +- .../client/cli/commands/domain/DomainList.java | 22 +- .../client/cli/commands/domain/DomainRead.java | 8 +- .../commands/domain/DomainResultManager.java | 12 + .../domain/DomainSyncopeOperations.java | 41 + .../entitlement/AbstractEntitlementCommand.java | 27 + .../entitlement/EntitlementCommand.java | 120 +++ .../commands/entitlement/EntitlementList.java | 40 + .../entitlement/EntitlementListRole.java | 61 ++ .../entitlement/EntitlementReadByUserId.java | 53 ++ .../entitlement/EntitlementReadByUsername.java | 53 ++ .../entitlement/EntitlementResultManager.java | 53 ++ .../entitlement/EntitlementSearchByRole.java | 53 ++ .../EntitlementSyncopeOperations.java | 74 ++ .../syncope/client/cli/commands/help/Help.java | 6 +- .../cli/commands/help/HelpResultManager.java | 3 + .../syncope/client/cli/commands/info/Info.java | 133 ++- .../cli/commands/info/InfoResultManager.java | 126 +++ .../cli/commands/install/InstallCommand.java | 13 +- .../commands/install/InstallResultManager.java | 10 + .../cli/commands/install/InstallSetup.java | 23 +- .../commands/logger/AbstractLoggerCommand.java | 7 +- .../cli/commands/logger/LoggerCommand.java | 3 +- .../cli/commands/logger/LoggerCreate.java | 4 +- .../cli/commands/logger/LoggerDelete.java | 6 +- .../client/cli/commands/logger/LoggerList.java | 21 +- .../client/cli/commands/logger/LoggerRead.java | 5 +- .../commands/logger/LoggerResultManager.java | 1 - .../logger/LoggerSyncopeOperations.java | 46 + .../cli/commands/logger/LoggerUpdate.java | 11 +- .../cli/commands/logger/LoggerUpdateAll.java | 8 +- .../AbstractNotificationCommand.java | 5 +- .../notification/NotificationCommand.java | 3 +- .../notification/NotificationDelete.java | 5 +- .../commands/notification/NotificationList.java | 23 +- .../commands/notification/NotificationRead.java | 4 +- .../NotificationSyncopeOperations.java | 41 + .../commands/policy/AbstractPolicyCommand.java | 7 +- .../cli/commands/policy/PolicyCommand.java | 1 - .../cli/commands/policy/PolicyDelete.java | 8 +- .../client/cli/commands/policy/PolicyList.java | 4 +- .../client/cli/commands/policy/PolicyRead.java | 6 +- .../policy/PolicySyncopeOperations.java | 42 + .../question/AbstractQuestionCommand.java | 27 + .../cli/commands/question/QuestionCommand.java | 107 +++ .../cli/commands/question/QuestionDelete.java | 56 ++ .../cli/commands/question/QuestionList.java | 45 + .../cli/commands/question/QuestionRead.java | 60 ++ .../question/QuestionResultManager.java | 38 + .../question/QuestionSyncopeOperations.java | 45 + .../commands/realm/AbstractRealmCommand.java | 27 + .../client/cli/commands/realm/RealmCommand.java | 95 +++ .../client/cli/commands/realm/RealmList.java | 45 + .../cli/commands/realm/RealmResultManager.java | 39 + .../commands/realm/RealmSyncopeOperations.java | 43 + .../commands/report/AbstractReportCommand.java | 5 +- .../cli/commands/report/ReportCommand.java | 5 +- .../cli/commands/report/ReportDelete.java | 9 +- .../commands/report/ReportDeleteExecution.java | 11 +- .../cli/commands/report/ReportExecute.java | 13 +- .../commands/report/ReportExportExecution.java | 28 +- .../client/cli/commands/report/ReportList.java | 22 +- .../cli/commands/report/ReportListJobs.java | 23 +- .../client/cli/commands/report/ReportRead.java | 6 +- .../commands/report/ReportReadExecution.java | 8 +- .../report/ReportSyncopeOperations.java | 65 ++ .../resource/AbstractResourceCommand.java | 7 +- .../cli/commands/resource/ResourceCommand.java | 3 +- .../cli/commands/resource/ResourceDelete.java | 7 +- .../cli/commands/resource/ResourceList.java | 21 +- .../cli/commands/resource/ResourceRead.java | 7 +- .../resource/ResourceResultManager.java | 7 +- .../resource/ResourceSyncopeOperations.java | 51 ++ .../cli/commands/role/AbstractRoleCommand.java | 27 + .../client/cli/commands/role/RoleCommand.java | 108 +++ .../client/cli/commands/role/RoleDelete.java | 57 ++ .../client/cli/commands/role/RoleList.java | 45 + .../client/cli/commands/role/RoleRead.java | 60 ++ .../cli/commands/role/RoleResultManager.java | 57 ++ .../commands/role/RoleSyncopeOperations.java | 41 + .../commands/schema/AbstractSchemaCommand.java | 7 +- .../cli/commands/schema/SchemaCommand.java | 8 +- .../cli/commands/schema/SchemaDelete.java | 7 +- .../client/cli/commands/schema/SchemaList.java | 4 +- .../cli/commands/schema/SchemaListAll.java | 54 +- .../cli/commands/schema/SchemaListDerived.java | 28 +- .../cli/commands/schema/SchemaListPlain.java | 28 +- .../cli/commands/schema/SchemaListVirtual.java | 28 +- .../client/cli/commands/schema/SchemaRead.java | 5 +- .../schema/SchemaSyncopeOperations.java | 54 ++ .../commands/self/AbstractWorkflowCommand.java | 27 + .../cli/commands/self/WorkflowCommand.java | 103 +++ .../commands/self/WorkflowExportDefinition.java | 56 ++ .../commands/self/WorkflowExportDiagram.java | 68 ++ .../commands/self/WorkflowResultManager.java | 38 + .../self/WorkflowSyncopeOperations.java | 40 + .../cli/commands/task/AbstractTaskCommand.java | 5 +- .../client/cli/commands/task/TaskCommand.java | 5 +- .../client/cli/commands/task/TaskDelete.java | 6 +- .../client/cli/commands/task/TaskExecute.java | 9 +- .../cli/commands/task/TaskExecutionDelete.java | 6 +- .../cli/commands/task/TaskExecutionRead.java | 5 +- .../client/cli/commands/task/TaskList.java | 4 +- .../cli/commands/task/TaskListRunningJobs.java | 46 + .../commands/task/TaskListScheduledJobs.java | 45 + .../client/cli/commands/task/TaskRead.java | 5 +- .../cli/commands/task/TaskResultManager.java | 2 +- .../cli/commands/task/TaskRunningJobs.java | 34 - .../cli/commands/task/TaskScheduledJobs.java | 34 - .../commands/task/TaskSyncopeOperations.java | 66 ++ .../cli/commands/user/AbstractUserCommand.java | 27 + .../client/cli/commands/user/UserCommand.java | 143 ++++ .../client/cli/commands/user/UserCount.java | 45 + .../client/cli/commands/user/UserDelete.java | 55 ++ .../client/cli/commands/user/UserGetKey.java | 45 + .../cli/commands/user/UserGetUsername.java | 45 + .../client/cli/commands/user/UserList.java | 61 ++ .../client/cli/commands/user/UserRead.java | 60 ++ .../cli/commands/user/UserResultManager.java | 107 +++ .../commands/user/UserSearchByAttribute.java | 70 ++ .../cli/commands/user/UserSearchByResource.java | 69 ++ .../cli/commands/user/UserSearchByRole.java | 63 ++ .../commands/user/UserSyncopeOperations.java | 78 ++ .../syncope/client/cli/util/CommandUtils.java | 1 - .../client/cli/util/FileSystemUtils.java | 9 +- .../syncope/client/cli/util/JasyptUtils.java | 1 - .../syncope/client/cli/view/Messages.java | 7 +- .../console/pages/ProvisioningModalPage.java | 15 +- .../syncope/client/console/pages/Realms.java | 2 - .../syncope/client/console/panels/Realm.java | 2 - .../client/console/panels/RealmModalPanel.java | 2 - .../console/panels/ResourceConnConfPanel.java | 12 +- .../console/panels/ResourceMappingPanel.java | 20 +- .../console/rest/ConnectorRestClient.java | 59 +- .../client/console/rest/LoggerRestClient.java | 4 +- .../client/console/rest/ResourceRestClient.java | 12 +- client/enduser/pom.xml | 194 +++++ .../enduser/SyncopeEnduserApplication.java | 157 ++++ .../client/enduser/SyncopeEnduserSession.java | 279 +++++++ .../client/enduser/adapters/UserTOAdapter.java | 78 ++ .../client/enduser/model/Credentials.java | 65 ++ .../client/enduser/model/SchemaResponse.java | 79 ++ .../client/enduser/model/UserTORequest.java | 174 ++++ .../syncope/client/enduser/pages/HomePage.java | 35 + .../enduser/resources/AbstractBaseResource.java | 58 ++ .../client/enduser/resources/ErrorResource.java | 50 ++ .../client/enduser/resources/LoginResource.java | 84 ++ .../enduser/resources/LogoutResource.java | 43 + .../enduser/resources/SchemaResource.java | 116 +++ .../resources/SecurityQuestionResource.java | 73 ++ .../resources/UserSelfCreateResource.java | 97 +++ .../enduser/resources/UserSelfReadResource.java | 66 ++ .../resources/UserSelfUpdateResource.java | 96 +++ .../META-INF/resources/app/css/app.css | 28 + .../META-INF/resources/app/css/editUser.css | 253 ++++++ .../META-INF/resources/app/css/login.css | 103 +++ .../META-INF/resources/app/img/ajax-loader.gif | Bin 0 -> 1924 bytes .../META-INF/resources/app/img/busy.gif | Bin 0 -> 2834 bytes .../META-INF/resources/app/img/favicon.png | Bin 0 -> 641 bytes .../META-INF/resources/app/img/logo-green.png | Bin 0 -> 12178 bytes .../META-INF/resources/app/img/logo.png | Bin 0 -> 8913 bytes .../resources/META-INF/resources/app/index.html | 116 +++ .../resources/META-INF/resources/app/js/app.js | 283 +++++++ .../app/js/controllers/HomeController.js | 39 + .../app/js/controllers/LanguageController.js | 66 ++ .../app/js/controllers/LoginController.js | 93 +++ .../app/js/controllers/UserController.js | 206 +++++ .../app/js/directives/dynamicAttribute.js | 190 +++++ .../js/directives/dynamicDerivedAttributes.js | 52 ++ .../app/js/directives/dynamicPlainAttributes.js | 45 + .../js/directives/dynamicVirtualAttributes.js | 52 ++ .../resources/app/js/directives/equals.js | 49 ++ .../resources/app/js/directives/loader.js | 32 + .../app/js/directives/navigationButtons.js | 31 + .../js/directives/passwordStrengthEstimator.js | 102 +++ .../resources/app/js/filters/propsFilter.js | 52 ++ .../resources/app/js/services/authService.js | 74 ++ .../resources/app/js/services/realmService.js | 47 ++ .../resources/app/js/services/schemaService.js | 42 + .../app/js/services/securityQuestionService.js | 41 + .../app/js/services/userSelfService.js | 69 ++ .../resources/app/views/dynamicAttribute.html | 58 ++ .../app/views/dynamicDerivedAttributes.html | 21 + .../app/views/dynamicPlainAttributes.html | 22 + .../app/views/dynamicVirtualAttributes.html | 18 + .../META-INF/resources/app/views/editUser.html | 73 ++ .../resources/app/views/generic-error.html | 24 + .../META-INF/resources/app/views/home.html | 34 + .../resources/app/views/navigationButtons.html | 8 + .../META-INF/resources/app/views/self.html | 131 +++ .../resources/app/views/user-credentials.html | 60 ++ .../app/views/user-derived-schemas.html | 37 + .../resources/app/views/user-groups.html | 37 + .../resources/app/views/user-plain-schemas.html | 37 + .../resources/app/views/user-resources.html | 28 + .../app/views/user-virtual-schemas.html | 37 + .../main/resources/META-INF/web-fragment.xml | 72 ++ .../src/main/resources/enduser.properties | 30 + .../syncope/client/enduser/pages/HomePage.html | 22 + .../enduser/SyncopeEnduserApplicationTest.java | 69 ++ .../syncope/client/lib/SyncopeClient.java | 13 + client/pom.xml | 1 + .../syncope/common/lib/patch/PasswordPatch.java | 2 +- .../lib/patch/ResourceDeassociationPatch.java | 80 ++ .../org/apache/syncope/common/lib/to/AnyTO.java | 9 - .../common/lib/to/ConnIdObjectClassTO.java | 78 ++ .../syncope/common/lib/to/ConnInstanceTO.java | 38 +- .../common/lib/to/PropagationStatus.java | 50 -- .../common/lib/to/PropagationTaskTO.java | 10 +- .../common/lib/to/ProvisioningResult.java | 55 ++ .../syncope/common/lib/to/ResourceTO.java | 47 +- .../syncope/common/lib/types/Entitlement.java | 14 +- .../lib/types/PropagationTaskExecStatus.java | 3 +- .../common/lib/wrap/AbstractWrappable.java | 46 - .../apache/syncope/common/lib/wrap/AnyKey.java | 30 - .../common/lib/wrap/ConnIdObjectClass.java | 30 - .../syncope/common/lib/wrap/package-info.java | 23 - .../common/rest/api/CollectionWrapper.java | 80 -- .../syncope/common/rest/api/LoggerWrapper.java | 56 ++ .../syncope/common/rest/api/RESTHeaders.java | 5 + .../common/rest/api/service/AnyService.java | 8 +- .../rest/api/service/ConnectorService.java | 43 +- .../rest/api/service/ResourceService.java | 14 +- .../rest/api/service/UserSelfService.java | 10 +- .../common/rest/api/service/UserService.java | 4 +- .../syncope/core/logic/AbstractAnyLogic.java | 44 +- .../core/logic/AbstractResourceAssociator.java | 19 +- .../syncope/core/logic/AnyObjectLogic.java | 69 +- .../syncope/core/logic/AnyTypeClassLogic.java | 4 +- .../apache/syncope/core/logic/AnyTypeLogic.java | 4 +- .../syncope/core/logic/ConnectorLogic.java | 76 +- .../apache/syncope/core/logic/GroupLogic.java | 68 +- .../syncope/core/logic/ResourceLogic.java | 25 +- .../apache/syncope/core/logic/SchemaLogic.java | 2 +- .../apache/syncope/core/logic/UserLogic.java | 137 +-- .../notification/NotificationJobDelegate.java | 2 +- .../core/logic/report/ReportJobDelegate.java | 2 +- .../core/logic/report/StaticReportlet.java | 2 +- .../core/logic/report/UserReportlet.java | 2 +- .../syncope/core/misc/ConnObjectUtils.java | 259 ------ .../syncope/core/misc/ExceptionUtils2.java | 47 -- .../apache/syncope/core/misc/FormatUtils.java | 117 --- .../apache/syncope/core/misc/MappingUtils.java | 800 ------------------ .../apache/syncope/core/misc/RealmUtils.java | 61 -- .../apache/syncope/core/misc/TemplateUtils.java | 223 ----- .../syncope/core/misc/jexl/JexlUtils.java | 2 +- .../core/misc/security/AuthDataAccessor.java | 4 +- .../misc/security/SyncopeGrantedAuthority.java | 2 +- .../core/misc/utils/ConnObjectUtils.java | 259 ++++++ .../core/misc/utils/ExceptionUtils2.java | 47 ++ .../syncope/core/misc/utils/FormatUtils.java | 121 +++ .../syncope/core/misc/utils/MappingUtils.java | 831 +++++++++++++++++++ .../syncope/core/misc/utils/RealmUtils.java | 61 ++ .../syncope/core/misc/utils/TemplateUtils.java | 223 +++++ core/misc/src/main/resources/utilsContext.xml | 32 + .../persistence/api/entity/ConnInstance.java | 41 +- .../api/entity/resource/ExternalResource.java | 15 +- .../api/entity/task/PropagationTask.java | 2 + .../jpa/content/ContentLoaderHandler.java | 2 +- .../jpa/content/XMLContentExporter.java | 2 +- .../persistence/jpa/dao/JPAAnySearchDAO.java | 2 +- .../core/persistence/jpa/dao/JPAGroupDAO.java | 2 +- .../jpa/entity/AbstractPlainAttrValue.java | 2 +- .../persistence/jpa/entity/JPAConnInstance.java | 33 +- .../entity/resource/JPAExternalResource.java | 67 +- .../jpa/entity/task/JPAPropagationTask.java | 17 +- .../persistence/jpa/DummyConnectorRegistry.java | 13 +- .../persistence/jpa/inner/ConnInstanceTest.java | 6 +- .../persistence/jpa/inner/ResourceTest.java | 3 - .../persistence/jpa/outer/ConnInstanceTest.java | 2 +- .../test/resources/domains/MasterContent.xml | 102 +-- .../api/AnyObjectProvisioningManager.java | 2 +- .../provisioning/api/ConnIdBundleManager.java | 2 +- .../core/provisioning/api/Connector.java | 50 +- .../core/provisioning/api/ConnectorFactory.java | 23 +- .../provisioning/api/ConnectorRegistry.java | 12 - .../api/GroupProvisioningManager.java | 4 +- .../provisioning/api/ProvisioningManager.java | 14 +- .../api/UserProvisioningManager.java | 30 +- .../api/data/ConnInstanceDataBinder.java | 16 +- .../api/data/ResourceDataBinder.java | 7 +- .../api/propagation/PropagationReporter.java | 30 +- .../propagation/PropagationTaskCallable.java | 32 + .../propagation/PropagationTaskExecutor.java | 21 +- .../api/sync/ProvisioningProfile.java | 4 +- .../api/sync/ProvisioningReport.java | 140 ++++ .../api/sync/ProvisioningResult.java | 140 ---- .../core/provisioning/api/sync/PushActions.java | 4 +- .../core/provisioning/api/sync/SyncActions.java | 4 +- .../provisioning/java/AsyncConnectorFacade.java | 82 +- .../provisioning/java/ConnectorFacadeProxy.java | 166 +--- .../provisioning/java/ConnectorManager.java | 76 +- .../DefaultAnyObjectProvisioningManager.java | 72 +- .../java/DefaultGroupProvisioningManager.java | 84 +- .../java/DefaultUserProvisioningManager.java | 152 ++-- .../provisioning/java/VirAttrHandlerImpl.java | 4 +- .../java/data/AbstractAnyDataBinder.java | 9 +- .../java/data/ConnInstanceDataBinderImpl.java | 48 +- .../java/data/RealmDataBinderImpl.java | 2 +- .../java/data/ResourceDataBinderImpl.java | 33 +- .../java/data/TaskDataBinderImpl.java | 3 +- .../java/job/AbstractSchedTaskJobDelegate.java | 2 +- .../java/job/SchedulerShutdown.java | 4 - .../java/job/SpringBeanJobFactory.java | 6 +- .../core/provisioning/java/job/TaskJob.java | 2 +- .../notification/NotificationManagerImpl.java | 19 +- .../AbstractPropagationTaskExecutor.java | 66 +- .../DBPasswordPropagationActions.java | 2 +- .../propagation/DefaultPropagationReporter.java | 82 +- .../LDAPPasswordPropagationActions.java | 2 +- .../PriorityPropagationTaskExecutor.java | 168 ++-- .../propagation/PropagationManagerImpl.java | 4 +- .../PropagationTaskCallableImpl.java | 94 +++ .../sync/AbstractProvisioningJobDelegate.java | 104 +-- .../java/sync/AbstractPushResultHandler.java | 18 +- .../java/sync/AbstractSyncResultHandler.java | 94 +-- .../java/sync/AbstractSyncopeResultHandler.java | 2 +- .../sync/AnyObjectSyncResultHandlerImpl.java | 11 +- .../java/sync/DBPasswordSyncActions.java | 8 +- .../java/sync/DefaultPushActions.java | 6 +- .../java/sync/DefaultSyncActions.java | 6 +- .../java/sync/GroupSyncResultHandlerImpl.java | 13 +- .../java/sync/LDAPMembershipSyncActions.java | 14 +- .../java/sync/LDAPPasswordSyncActions.java | 4 +- .../sync/PlainAttrsSyncCorrelationRule.java | 8 +- .../provisioning/java/sync/SyncJobDelegate.java | 5 +- .../core/provisioning/java/sync/SyncUtils.java | 4 +- .../java/sync/UserSyncResultHandlerImpl.java | 17 +- .../src/main/resources/provisioning.properties | 7 + .../src/main/resources/provisioningContext.xml | 20 +- .../core/provisioning/java/AbstractTest.java | 1 + .../core/provisioning/java/MappingTest.java | 2 +- .../syncope/core/rest/cxf/AddETagFilter.java | 18 +- .../rest/cxf/ThreadLocalCleanupListener.java | 2 +- .../rest/cxf/service/AbstractAnyService.java | 59 +- .../rest/cxf/service/AbstractServiceImpl.java | 30 +- .../rest/cxf/service/ConnectorServiceImpl.java | 39 +- .../rest/cxf/service/LoggerServiceImpl.java | 4 +- .../rest/cxf/service/ResourceServiceImpl.java | 37 +- .../rest/cxf/service/UserSelfServiceImpl.java | 11 +- .../core/rest/cxf/service/UserServiceImpl.java | 7 +- .../CamelAnyObjectProvisioningManager.java | 37 +- .../camel/CamelGroupProvisioningManager.java | 45 +- .../camel/CamelUserProvisioningManager.java | 106 ++- .../processor/AnyObjectCreateProcessor.java | 13 +- .../processor/AnyObjectDeleteProcessor.java | 13 +- .../AnyObjectDeprovisionProcessor.java | 13 +- .../processor/AnyObjectProvisionProcessor.java | 13 +- .../processor/AnyObjectUpdateProcessor.java | 13 +- .../processor/GroupCreateInSyncProcessor.java | 13 +- .../camel/processor/GroupCreateProcessor.java | 13 +- .../camel/processor/GroupDeleteProcessor.java | 13 +- .../processor/GroupDeprovisionProcessor.java | 13 +- .../processor/GroupProvisionProcessor.java | 13 +- .../camel/processor/GroupUpdateProcessor.java | 9 +- .../processor/UserConfirmPwdResetProcessor.java | 12 +- .../camel/processor/UserCreateProcessor.java | 9 +- .../camel/processor/UserDeleteProcessor.java | 13 +- .../processor/UserDeprovisionProcessor.java | 13 +- .../camel/processor/UserProvisionProcessor.java | 13 +- .../processor/UserSetStatusInSyncProcessor.java | 2 +- .../UserStatusPropagationProcessor.java | 14 +- .../processor/UserUpdateInSyncProcessor.java | 9 +- .../camel/processor/UserUpdateProcessor.java | 13 +- .../src/main/resources/provisioning.properties | 8 + .../src/main/resources/userRoutes.xml | 2 +- fit/console-reference/pom.xml | 4 +- fit/core-reference/pom.xml | 9 +- .../main/resources/all/provisioning.properties | 8 + .../resources/mariadb/provisioning.properties | 9 +- .../resources/mysql/provisioning.properties | 9 +- .../resources/oracle/provisioning.properties | 9 +- .../resources/postgres/provisioning.properties | 9 +- .../src/main/resources/provisioning.properties | 9 +- .../resources/sqlserver/provisioning.properties | 9 +- .../fit/core/reference/AbstractITCase.java | 98 ++- .../fit/core/reference/AnyObjectITCase.java | 16 +- .../core/reference/AuthenticationITCase.java | 40 +- .../fit/core/reference/CamelRouteITCase.java | 2 +- .../fit/core/reference/ConnectorITCase.java | 84 +- .../syncope/fit/core/reference/GroupITCase.java | 227 ++++- .../fit/core/reference/LoggerITCase.java | 8 +- .../fit/core/reference/MultitenancyITCase.java | 5 +- .../core/reference/NotificationTaskITCase.java | 4 +- .../fit/core/reference/PlainSchemaITCase.java | 11 +- .../fit/core/reference/PushTaskITCase.java | 4 +- .../fit/core/reference/ReportITCase.java | 2 +- .../fit/core/reference/ResourceITCase.java | 16 +- .../fit/core/reference/SearchITCase.java | 2 +- .../fit/core/reference/SyncTaskITCase.java | 28 +- .../syncope/fit/core/reference/UserITCase.java | 471 ++++++----- .../fit/core/reference/UserSelfITCase.java | 26 +- .../fit/core/reference/UserWorkflowITCase.java | 16 +- .../fit/core/reference/VirAttrITCase.java | 90 +- fit/enduser-reference/pom.xml | 413 +++++++++ .../src/main/resources/context.xml | 23 + .../src/main/resources/enduser.properties | 30 + .../src/main/resources/log4j2.xml | 58 ++ .../src/main/webapp/WEB-INF/glassfish-web.xml | 25 + .../WEB-INF/jboss-deployment-structure.xml | 37 + .../src/main/webapp/WEB-INF/weblogic.xml | 35 + fit/pom.xml | 1 + pom.xml | 97 ++- 427 files changed, 13817 insertions(+), 4765 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/77fc5d26/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java ---------------------------------------------------------------------- diff --cc client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java index b5850ad,43944bd..db85db1 --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java @@@ -41,10 -37,9 +41,8 @@@ import org.apache.syncope.common.lib.to import org.apache.syncope.common.lib.to.ResourceTO; import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.ResourceDeassociationAction; - import org.apache.syncope.common.lib.wrap.AbstractWrappable; - import org.apache.syncope.common.lib.wrap.AnyKey; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; @@@ -242,10 -236,10 +239,10 @@@ public class ProvisioningModalPage<T ex } if (beans.isEmpty()) { - window.close(target); + modal.close(target); } else { - final BulkActionResult res = resourceRestClient.bulkAssociationAction( - resourceTO.getKey(), anyTypeKind.name(), type, subjectKeys); - BulkActionResult result = - resourceRestClient.bulkAssociationAction(resourceTO.getKey(), anyTypeKind.name(), action, anyKeys); ++ BulkActionResult res = resourceRestClient.bulkAssociationAction(resourceTO.getKey(), anyTypeKind.name(), ++ action, anyKeys); ((BasePage) pageRef.getPage()).setModalResult(true); http://git-wip-us.apache.org/repos/asf/syncope/blob/77fc5d26/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/77fc5d26/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/77fc5d26/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmModalPanel.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/77fc5d26/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceConnConfPanel.java ---------------------------------------------------------------------- diff --cc client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceConnConfPanel.java index dbb3f37,fdb9f83..730b4cf --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceConnConfPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceConnConfPanel.java @@@ -35,16 -55,51 +35,16 @@@ public abstract class ResourceConnConfP private final boolean createFlag; - private List<ConnConfProperty> connConfProperties; - - private final WebMarkupContainer connConfPropContainer; - - private final AjaxButton check; - - public ResourceConnConfPanel(final String id, final ResourceTO resourceTO, final boolean createFlag) { - super(id); - setOutputMarkupId(true); + public ResourceConnConfPanel(final String id, final IModel<ResourceTO> model, final boolean createFlag) { + super(id, model); this.createFlag = createFlag; - this.resourceTO = resourceTO; - - connConfProperties = getConnConfProperties(); - - connConfPropContainer = new WebMarkupContainer("connectorPropertiesContainer"); - connConfPropContainer.setOutputMarkupId(true); - add(connConfPropContainer); - - /* - * the list of overridable connector properties - */ - final ListView<ConnConfProperty> connPropView = new ConnConfPropertyListView("connectorProperties", - new PropertyModel<List<ConnConfProperty>>(this, "connConfProperties"), - false, resourceTO.getConfOverride()); - connPropView.setOutputMarkupId(true); - connConfPropContainer.add(connPropView); - - check = new IndicatingAjaxButton("check", new ResourceModel("check")) { - private static final long serialVersionUID = -4199438518229098169L; + final List<ConnConfProperty> connConfProperties = getConnProperties(model.getObject()); - model.getObject().getConnConfProperties().clear(); - model.getObject().getConnConfProperties().addAll(connConfProperties); ++ model.getObject().getConfOverride().clear(); ++ model.getObject().getConfOverride().addAll(connConfProperties); - @Override - public void onSubmit(final AjaxRequestTarget target, final Form<?> form) { - final ResourceTO to = (ResourceTO) form.getModelObject(); - - if (restClient.check(to)) { - info(getString("success_connection")); - } else { - error(getString("error_connection")); - } - - ((BaseModalPage) getPage()).getFeedbackPanel().refresh(target); - } - }; + setConfPropertyListView("connConfProperties", false); check.setEnabled(!connConfProperties.isEmpty()); check.setVisible(!connConfProperties.isEmpty()); http://git-wip-us.apache.org/repos/asf/syncope/blob/77fc5d26/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java ---------------------------------------------------------------------- diff --cc client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java index 330a4c2,ceabd57..dd73ba3 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java @@@ -23,15 -22,18 +23,17 @@@ import java.util.ArrayList import java.util.Arrays; import java.util.Collections; import java.util.Comparator; -import java.util.HashSet; import java.util.List; import java.util.Set; + import org.apache.commons.collections4.CollectionUtils; + import org.apache.commons.collections4.Transformer; import org.apache.syncope.client.console.commons.Constants; import org.apache.syncope.client.console.commons.JexlHelpUtils; -import org.apache.syncope.client.console.panels.ResourceConnConfPanel.ConnConfModEvent; import org.apache.syncope.client.console.rest.ConnectorRestClient; import org.apache.syncope.client.console.rest.SchemaRestClient; +import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink; +import org.apache.syncope.client.console.wicket.markup.html.form.ActionLinksPanel; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxCheckBoxPanel; -import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDecoratedCheckbox; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownChoicePanel; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel; import org.apache.syncope.client.console.wicket.markup.html.form.FieldPanel; http://git-wip-us.apache.org/repos/asf/syncope/blob/77fc5d26/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java ---------------------------------------------------------------------- diff --cc client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java index 2414070,d483411..208afa4 --- a/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java @@@ -57,15 -55,11 +56,15 @@@ public class ConnectorRestClient extend return connectors; } - public void create(final ConnInstanceTO connectorTO) { + public ConnInstanceTO create(final ConnInstanceTO connectorTO) { - Set<ConnConfProperty> filteredConf = filterProperties(connectorTO.getConfiguration()); - connectorTO.getConfiguration().clear(); - connectorTO.getConfiguration().addAll(filteredConf); + Set<ConnConfProperty> filteredConf = filterProperties(connectorTO.getConf()); + connectorTO.getConf().clear(); + connectorTO.getConf().addAll(filteredConf); - getService(ConnectorService.class).create(connectorTO); + + final ConnectorService service = getService(ConnectorService.class); + final Response response = service.create(connectorTO); + + return getObject(service, response.getLocation(), ConnInstanceTO.class); } /** http://git-wip-us.apache.org/repos/asf/syncope/blob/77fc5d26/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java ---------------------------------------------------------------------- diff --cc client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java index 3a99c1d,f5579cf..3f7672d --- a/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/ResourceRestClient.java @@@ -19,9 -19,9 +19,10 @@@ package org.apache.syncope.client.console.rest; import java.util.List; +import javax.ws.rs.core.Response; import org.apache.syncope.client.console.SyncopeConsoleSession; import org.apache.syncope.common.lib.SyncopeClientException; + import org.apache.syncope.common.lib.patch.ResourceDeassociationPatch; import org.apache.syncope.common.lib.to.BulkAction; import org.apache.syncope.common.lib.to.BulkActionResult; import org.apache.syncope.common.lib.to.ResourceTO; http://git-wip-us.apache.org/repos/asf/syncope/blob/77fc5d26/pom.xml ----------------------------------------------------------------------
