Merge branch 'master' into SYNCOPE-156
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d9437d37 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d9437d37 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d9437d37 Branch: refs/heads/master Commit: d9437d37a38d0f185289b1c61d2d79c5ce8edaaa Parents: bbb94a9 e545928 Author: Marco Di Sabatino Di Diodoro <[email protected]> Authored: Thu Aug 27 13:11:57 2015 +0200 Committer: Marco Di Sabatino Di Diodoro <[email protected]> Committed: Thu Aug 27 13:11:57 2015 +0200 ---------------------------------------------------------------------- README.md | 24 ++ archetype/pom.xml | 18 +- .../META-INF/maven/archetype-metadata.xml | 10 + .../archetype-resources/common/pom.xml | 60 ++++ .../archetype-resources/console/pom.xml | 43 ++- .../resources/archetype-resources/core/pom.xml | 6 + .../main/resources/archetype-resources/pom.xml | 26 +- archetype/src/main/resources/meta-pom.xml | 26 +- .../client/cli/commands/PolicyCommand.java | 2 +- .../client/cli/commands/ReportCommand.java | 14 - .../console/commons/status/StatusUtils.java | 2 +- .../console/panels/ResourceSecurityPanel.java | 2 +- .../console/rest/ConnectorRestClient.java | 16 +- .../client/console/rest/GroupRestClient.java | 15 +- .../client/console/rest/PolicyRestClient.java | 2 +- .../client/console/rest/ReportRestClient.java | 18 - .../client/console/rest/UserRestClient.java | 15 +- .../client/lib/SyncopeClientFactoryBean.java | 2 +- .../lib/annotation/FormAttributeField.java | 36 -- .../syncope/common/lib/mod/StatusMod.java | 2 +- .../lib/policy/AbstractAccountRuleConf.java | 52 +++ .../lib/policy/AbstractPasswordRuleConf.java | 52 +++ .../common/lib/policy/AbstractPolicyTO.java | 97 ++++++ .../common/lib/policy/AccountPolicyTO.java | 77 +++++ .../common/lib/policy/AccountRuleConf.java | 23 ++ .../lib/policy/DefaultAccountRuleConf.java | 147 ++++++++ .../lib/policy/DefaultPasswordRuleConf.java | 342 +++++++++++++++++++ .../common/lib/policy/PasswordPolicyTO.java | 68 ++++ .../common/lib/policy/PasswordRuleConf.java | 23 ++ .../syncope/common/lib/policy/PolicyType.java | 43 +++ .../common/lib/policy/PushPolicySpec.java | 28 ++ .../syncope/common/lib/policy/RuleConf.java | 32 ++ .../common/lib/policy/SyncPolicySpec.java | 63 ++++ .../syncope/common/lib/policy/SyncPolicyTO.java | 45 +++ .../lib/report/AbstractAnyReportletConf.java | 6 - .../common/lib/report/StaticReportletConf.java | 2 +- .../syncope/common/lib/to/AbstractPolicyTO.java | 97 ------ .../syncope/common/lib/to/AccountPolicyTO.java | 59 ---- .../syncope/common/lib/to/PasswordPolicyTO.java | 46 --- .../syncope/common/lib/to/SyncPolicyTO.java | 46 --- .../apache/syncope/common/lib/to/SyncopeTO.java | 28 ++ .../common/lib/types/AbstractPolicySpec.java | 100 ------ .../common/lib/types/AccountPolicySpec.java | 121 ------- .../common/lib/types/EntityViolationType.java | 3 - .../common/lib/types/PasswordPolicySpec.java | 300 ---------------- .../syncope/common/lib/types/PolicySpec.java | 25 -- .../syncope/common/lib/types/PolicyType.java | 43 --- .../common/lib/types/SyncPolicySpec.java | 62 ---- .../common/lib/wrap/ReportletConfClass.java | 30 -- .../org/apache/syncope/common/lib/JAXBTest.java | 42 +++ .../rest/api/service/ConnectorService.java | 9 +- .../common/rest/api/service/PolicyService.java | 2 +- .../common/rest/api/service/ReportService.java | 11 - .../syncope/core/logic/ConnectorLogic.java | 64 ++-- .../apache/syncope/core/logic/PolicyLogic.java | 14 +- .../apache/syncope/core/logic/ReportLogic.java | 75 ---- .../apache/syncope/core/logic/SyncopeLogic.java | 32 +- .../apache/syncope/core/logic/UserLogic.java | 2 +- .../init/ClassPathScanImplementationLookup.java | 200 +++++++++++ .../init/ImplementationClassNamesLoader.java | 144 -------- .../core/logic/report/AbstractReportlet.java | 22 +- .../core/logic/report/GroupReportlet.java | 14 +- .../core/logic/report/ReportJobDelegate.java | 33 +- .../syncope/core/logic/report/Reportlet.java | 46 --- .../core/logic/report/ReportletConfClass.java | 32 -- .../core/logic/report/StaticReportlet.java | 39 ++- .../core/logic/report/UserReportlet.java | 14 +- .../syncope/core/misc/ConnObjectUtils.java | 24 +- .../apache/syncope/core/misc/MappingUtils.java | 6 +- .../core/misc/policy/AccountPolicyEnforcer.java | 90 ----- .../InvalidPasswordPolicySpecException.java | 37 -- .../misc/policy/InvalidPasswordRuleConf.java | 37 ++ .../misc/policy/PasswordPolicyEnforcer.java | 196 ----------- .../misc/policy/PolicyEnforceException.java | 32 -- .../core/misc/policy/PolicyEvaluator.java | 103 ------ .../misc/security/DefaultPasswordGenerator.java | 334 ++++++++++++++++++ .../core/misc/security/PasswordGenerator.java | 310 +---------------- .../misc/src/main/resources/security.properties | 1 + .../misc/src/main/resources/securityContext.xml | 1 + .../misc/security/PasswordGeneratorTest.java | 146 ++++---- .../persistence/api/ImplementationLookup.java | 53 +++ .../core/persistence/api/dao/AccountRule.java | 30 ++ .../api/dao/AccountRuleConfClass.java | 32 ++ .../core/persistence/api/dao/PasswordRule.java | 30 ++ .../api/dao/PasswordRuleConfClass.java | 32 ++ .../core/persistence/api/dao/PolicyDAO.java | 2 +- .../core/persistence/api/dao/Reportlet.java | 40 +++ .../persistence/api/dao/ReportletConfClass.java | 32 ++ .../persistence/api/entity/AccountPolicy.java | 33 -- .../persistence/api/entity/PasswordPolicy.java | 23 -- .../core/persistence/api/entity/Policy.java | 5 - .../core/persistence/api/entity/PushPolicy.java | 23 -- .../core/persistence/api/entity/Realm.java | 3 + .../core/persistence/api/entity/Report.java | 15 +- .../api/entity/ReportletConfInstance.java | 33 -- .../core/persistence/api/entity/SyncPolicy.java | 23 -- .../api/entity/policy/AccountPolicy.java | 50 +++ .../api/entity/policy/PasswordPolicy.java | 40 +++ .../api/entity/policy/PushPolicy.java | 29 ++ .../api/entity/policy/SyncPolicy.java | 30 ++ .../api/entity/resource/ExternalResource.java | 6 +- .../persistence/jpa/dao/DefaultAccountRule.java | 109 ++++++ .../jpa/dao/DefaultPasswordRule.java | 221 ++++++++++++ .../jpa/dao/JPAExternalResourceDAO.java | 2 +- .../core/persistence/jpa/dao/JPAPolicyDAO.java | 14 +- .../core/persistence/jpa/dao/JPARealmDAO.java | 2 +- .../persistence/jpa/dao/JPAReportExecDAO.java | 2 +- .../core/persistence/jpa/dao/JPATaskDAO.java | 4 +- .../core/persistence/jpa/dao/JPAUserDAO.java | 119 ++++--- .../jpa/entity/JPAAccountPolicy.java | 84 ----- .../jpa/entity/JPAEntityFactory.java | 15 +- .../jpa/entity/JPAPasswordPolicy.java | 36 -- .../core/persistence/jpa/entity/JPAPolicy.java | 90 ----- .../persistence/jpa/entity/JPAPushPolicy.java | 39 --- .../core/persistence/jpa/entity/JPARealm.java | 6 +- .../core/persistence/jpa/entity/JPAReport.java | 33 +- .../jpa/entity/JPAReportletConfInstance.java | 7 +- .../persistence/jpa/entity/JPASyncPolicy.java | 36 -- .../jpa/entity/policy/AbstractPolicy.java | 67 ++++ .../jpa/entity/policy/JPAAccountPolicy.java | 153 +++++++++ .../policy/JPAAccountRuleConfInstance.java | 73 ++++ .../jpa/entity/policy/JPAPasswordPolicy.java | 108 ++++++ .../policy/JPAPasswordRuleConfInstance.java | 73 ++++ .../jpa/entity/policy/JPAPushPolicy.java | 55 +++ .../jpa/entity/policy/JPASyncPolicy.java | 54 +++ .../entity/resource/JPAExternalResource.java | 12 +- .../jpa/entity/task/AbstractTask.java | 87 +++++ .../jpa/entity/task/JPANotificationTask.java | 2 +- .../jpa/entity/task/JPAPropagationTask.java | 2 +- .../jpa/entity/task/JPASchedTask.java | 2 +- .../persistence/jpa/entity/task/JPATask.java | 96 ------ .../jpa/entity/task/JPATaskExec.java | 11 +- .../jpa/validation/entity/PolicyCheck.java | 41 --- .../jpa/validation/entity/PolicyValidator.java | 59 ---- .../resources/META-INF/spring-orm-oracle.xml | 22 +- .../resources/META-INF/spring-orm-sqlserver.xml | 22 +- .../src/main/resources/META-INF/spring-orm.xml | 22 +- .../jpa/DummyImplementationLookup.java | 73 ++++ .../core/persistence/jpa/inner/PolicyTest.java | 46 +-- .../core/persistence/jpa/inner/RealmTest.java | 4 +- .../core/persistence/jpa/inner/ReportTest.java | 4 +- .../core/persistence/jpa/inner/UserTest.java | 6 +- .../core/persistence/jpa/outer/ReportTest.java | 2 +- .../persistence/jpa/outer/ResourceTest.java | 2 +- .../test/resources/domains/MasterContent.xml | 54 +-- .../src/test/resources/domains/Two.properties | 2 +- .../src/test/resources/persistenceTest.xml | 2 + .../provisioning/api/data/PolicyDataBinder.java | 2 +- .../java/ConnIdBundleManagerImpl.java | 12 +- .../java/DefaultUserProvisioningManager.java | 4 +- .../java/data/PolicyDataBinderImpl.java | 100 ++++-- .../java/data/RealmDataBinderImpl.java | 4 +- .../java/data/ReportDataBinderImpl.java | 35 +- .../java/data/ResourceDataBinderImpl.java | 6 +- .../java/data/UserDataBinderImpl.java | 40 +++ .../java/job/SchedulerShutdown.java | 49 +++ .../propagation/PropagationManagerImpl.java | 2 +- .../provisioning/java/sync/SyncJobDelegate.java | 4 +- .../core/provisioning/java/sync/SyncUtils.java | 4 +- .../src/main/resources/provisioningContext.xml | 1 + .../java/DummyImplementationLookup.java | 73 ++++ .../rest/cxf/service/ConnectorServiceImpl.java | 8 +- .../rest/cxf/service/PolicyServiceImpl.java | 8 +- .../rest/cxf/service/ReportServiceImpl.java | 7 - .../activiti/ActivitiUserWorkflowAdapter.java | 4 +- .../camel/processor/UserProvisionProcessor.java | 2 +- .../UserStatusPropagationProcessor.java | 2 +- .../fit/buildtools/H2StartStopListener.java | 3 - .../fit/core/reference/TestAccountRule.java | 48 +++ .../fit/core/reference/TestAccountRuleConf.java | 37 ++ .../fit/core/reference/TestPasswordRule.java | 48 +++ .../core/reference/TestPasswordRuleConf.java | 37 ++ .../src/main/resources/log4j2.xml | 2 +- .../resources/scriptedsql/CreateScript.groovy | 52 --- .../resources/scriptedsql/DeleteScript.groovy | 43 --- .../resources/scriptedsql/SchemaScript.groovy | 50 --- .../resources/scriptedsql/SearchScript.groovy | 94 ----- .../resources/scriptedsql/SyncScript.groovy | 98 ------ .../resources/scriptedsql/TestScript.groovy | 31 -- .../resources/scriptedsql/UpdateScript.groovy | 67 ---- .../fit/core/reference/AbstractITCase.java | 5 +- .../fit/core/reference/ConnectorITCase.java | 51 +-- .../fit/core/reference/MultitenancyITCase.java | 3 +- .../fit/core/reference/PolicyITCase.java | 51 ++- .../syncope/fit/core/reference/RealmITCase.java | 12 +- .../fit/core/reference/ReportITCase.java | 7 +- .../fit/core/reference/SyncTaskITCase.java | 8 +- .../syncope/fit/core/reference/UserITCase.java | 233 ++++++++++--- .../fit/core/reference/UserSelfITCase.java | 2 +- .../fit/core/reference/VirAttrITCase.java | 16 +- .../resources/scriptedsql/CreateScript.groovy | 52 +++ .../resources/scriptedsql/DeleteScript.groovy | 43 +++ .../resources/scriptedsql/SchemaScript.groovy | 50 +++ .../resources/scriptedsql/SearchScript.groovy | 94 +++++ .../resources/scriptedsql/SyncScript.groovy | 98 ++++++ .../resources/scriptedsql/TestScript.groovy | 31 ++ .../resources/scriptedsql/UpdateScript.groovy | 67 ++++ pom.xml | 10 +- standalone/pom.xml | 16 +- standalone/src/main/resources/setenv.bat | 2 +- standalone/src/main/resources/setenv.sh | 2 +- 201 files changed, 5099 insertions(+), 3781 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/d9437d37/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/d9437d37/client/console/src/main/java/org/apache/syncope/client/console/rest/UserRestClient.java ----------------------------------------------------------------------
