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/973cd50f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/973cd50f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/973cd50f Branch: refs/heads/master Commit: 973cd50fe5c8852c6ba087fbbd984e54931ece94 Parents: 13f96e0 73f73f2 Author: fmartelli <[email protected]> Authored: Fri Oct 23 12:28:09 2015 +0200 Committer: fmartelli <[email protected]> Committed: Fri Oct 23 12:28:09 2015 +0200 ---------------------------------------------------------------------- client/cli/pom.xml | 15 +- .../apache/syncope/client/cli/ArgsManager.java | 50 +++ .../syncope/client/cli/AvailableServices.java | 31 ++ .../org/apache/syncope/client/cli/Command.java | 32 ++ .../syncope/client/cli/CommandClassScanner.java | 29 ++ .../client/cli/ComponentClassScanner.java | 44 ++ .../org/apache/syncope/client/cli/Input.java | 111 +++++ .../syncope/client/cli/ResultManager.java | 25 ++ .../apache/syncope/client/cli/SyncopeAdm.java | 116 ++--- .../syncope/client/cli/SyncopeServices.java | 32 +- .../client/cli/commands/AbstractCommand.java | 10 +- .../cli/commands/CommonsResultManager.java | 52 +++ .../cli/commands/ConfigurationCommand.java | 209 --------- .../client/cli/commands/LoggerCommand.java | 168 ------- .../cli/commands/NotificationCommand.java | 92 ---- .../client/cli/commands/PolicyCommand.java | 105 ----- .../client/cli/commands/ReportCommand.java | 433 +++++++++++++------ .../AbstractConfigurationCommand.java | 30 ++ .../configuration/ConfigurationCommand.java | 120 +++++ .../configuration/ConfigurationDelete.java | 57 +++ .../configuration/ConfigurationExport.java | 71 +++ .../configuration/ConfigurationGet.java | 36 ++ .../configuration/ConfigurationRead.java | 62 +++ .../ConfigurationResultManager.java | 53 +++ .../configuration/ConfigurationUpdate.java | 76 ++++ .../commands/domain/AbstractDomainCommand.java | 30 ++ .../cli/commands/domain/DomainCommand.java | 101 +++++ .../cli/commands/domain/DomainDelete.java | 53 +++ .../client/cli/commands/domain/DomainList.java | 38 ++ .../client/cli/commands/domain/DomainRead.java | 53 +++ .../commands/domain/DomainResultManager.java | 25 ++ .../syncope/client/cli/commands/help/Help.java | 43 ++ .../client/cli/commands/help/HelpCommand.java | 90 ++++ .../cli/commands/help/HelpResultManager.java | 25 ++ .../syncope/client/cli/commands/info/Info.java | 243 +++++++++++ .../client/cli/commands/info/InfoCommand.java | 180 ++++++++ .../cli/commands/info/InfoResultManager.java | 25 ++ .../cli/commands/install/InstallCommand.java | 87 ++++ .../install/InstallConfigFileTemplate.java | 57 +++ .../commands/install/InstallResultManager.java | 90 ++++ .../cli/commands/install/InstallSetup.java | 182 ++++++++ .../commands/logger/AbstractLoggerCommand.java | 30 ++ .../cli/commands/logger/LoggerCommand.java | 127 ++++++ .../cli/commands/logger/LoggerCreate.java | 70 +++ .../cli/commands/logger/LoggerDelete.java | 55 +++ .../client/cli/commands/logger/LoggerList.java | 37 ++ .../client/cli/commands/logger/LoggerRead.java | 62 +++ .../commands/logger/LoggerResultManager.java | 61 +++ .../cli/commands/logger/LoggerUpdate.java | 78 ++++ .../cli/commands/logger/LoggerUpdateAll.java | 69 +++ .../AbstractNotificationCommand.java | 30 ++ .../notification/NotificationCommand.java | 109 +++++ .../notification/NotificationDelete.java | 56 +++ .../commands/notification/NotificationList.java | 35 ++ .../commands/notification/NotificationRead.java | 54 +++ .../notification/NotificationResultManager.java | 25 ++ .../commands/policy/AbstractPolicyCommand.java | 30 ++ .../cli/commands/policy/PolicyCommand.java | 111 +++++ .../cli/commands/policy/PolicyDelete.java | 59 +++ .../client/cli/commands/policy/PolicyList.java | 59 +++ .../client/cli/commands/policy/PolicyRead.java | 58 +++ .../commands/policy/PolicyResultManager.java | 120 +++++ .../commands/schema/AbstractSchemaCommand.java | 30 ++ .../cli/commands/schema/SchemaCommand.java | 127 ++++++ .../cli/commands/schema/SchemaDelete.java | 64 +++ .../client/cli/commands/schema/SchemaList.java | 70 +++ .../cli/commands/schema/SchemaListAll.java | 55 +++ .../cli/commands/schema/SchemaListDerived.java | 40 ++ .../cli/commands/schema/SchemaListPlain.java | 40 ++ .../cli/commands/schema/SchemaListVirtual.java | 40 ++ .../client/cli/commands/schema/SchemaRead.java | 78 ++++ .../commands/schema/SchemaResultManager.java | 96 ++++ .../cli/commands/task/AbstractTaskCommand.java | 30 ++ .../client/cli/commands/task/TaskCommand.java | 140 ++++++ .../client/cli/commands/task/TaskDelete.java | 58 +++ .../client/cli/commands/task/TaskExecute.java | 66 +++ .../cli/commands/task/TaskExecutionDelete.java | 58 +++ .../cli/commands/task/TaskExecutionRead.java | 58 +++ .../client/cli/commands/task/TaskList.java | 59 +++ .../client/cli/commands/task/TaskRead.java | 60 +++ .../cli/commands/task/TaskResultManager.java | 222 ++++++++++ .../cli/commands/task/TaskRunningJobs.java | 34 ++ .../cli/commands/task/TaskScheduledJobs.java | 34 ++ .../syncope/client/cli/messages/Messages.java | 94 ++++ .../syncope/client/cli/messages/Table.java | 194 +++++++++ .../client/cli/messages/TwoColumnTable.java | 262 +++++++++++ .../syncope/client/cli/util/CommandUtils.java | 92 ++++ .../client/cli/util/FileSystemUtils.java | 48 ++ .../syncope/client/cli/util/JasyptUtils.java | 49 +++ .../cli/validators/DebugLevelValidator.java | 60 --- .../src/main/resources/configuration.properties | 18 + client/cli/src/main/resources/log4j2.xml | 24 +- .../cli/src/main/resources/syncope.properties | 19 - .../client/console/SyncopeConsoleSession.java | 4 +- .../commons/SortableAnyProviderComparator.java | 2 +- .../client/console/commons/status/Status.java | 2 +- .../syncope/client/console/pages/Login.java | 4 +- .../console/pages/ProvisioningModalPage.java | 2 +- .../client/console/pages/StatusModalPage.java | 2 +- .../console/panels/AbstractResourceModal.java | 2 +- .../console/panels/ResourceSecurityPanel.java | 2 +- .../console/rest/ConfigurationRestClient.java | 15 +- .../client/console/topology/Topology.java | 2 +- .../console/topology/WebSocketBehavior.java | 4 +- .../wicket/markup/html/form/ActionLink.java | 2 +- .../provision/ProvisionWizardBuilder.java | 6 +- .../client/lib/RestClientFactoryBean.java | 34 +- .../syncope/client/lib/SyncopeClient.java | 12 +- .../client/lib/SyncopeClientFactoryBean.java | 37 +- client/old_console/pom.xml | 1 + .../syncope/common/lib/AnyOperations.java | 26 +- .../syncope/common/lib/patch/AnyPatch.java | 5 +- .../org/apache/syncope/common/lib/to/AnyTO.java | 5 +- .../apache/syncope/common/lib/to/ConfTO.java | 30 -- .../apache/syncope/common/lib/to/MappingTO.java | 9 + .../syncope/common/lib/to/ProvisionTO.java | 18 + .../syncope/common/lib/to/VirSchemaTO.java | 20 + .../syncope/common/lib/types/AnyTypeKind.java | 2 +- .../common/lib/types/ClientExceptionType.java | 2 +- .../syncope/common/lib/types/Entitlement.java | 4 + .../common/lib/types/IntMappingType.java | 2 +- .../common/lib/types/PropagationByResource.java | 11 + .../syncope/common/lib/types/TaskType.java | 4 +- common/rest-api/pom.xml | 17 +- .../syncope/common/rest/api/Preference.java | 2 +- .../common/rest/api/service/AnyService.java | 22 +- .../rest/api/service/AnyTypeClassService.java | 2 +- .../common/rest/api/service/AnyTypeService.java | 2 +- .../rest/api/service/ConfigurationService.java | 4 +- .../rest/api/service/ConnectorService.java | 4 +- .../common/rest/api/service/DomainService.java | 2 +- .../common/rest/api/service/GroupService.java | 2 +- .../common/rest/api/service/LoggerService.java | 2 +- .../rest/api/service/NotificationService.java | 2 +- .../common/rest/api/service/PolicyService.java | 11 +- .../common/rest/api/service/RealmService.java | 2 +- .../api/service/RelationshipTypeService.java | 2 +- .../common/rest/api/service/ReportService.java | 2 +- .../rest/api/service/ResourceService.java | 4 +- .../common/rest/api/service/RoleService.java | 2 +- .../common/rest/api/service/SchemaService.java | 14 +- .../api/service/SecurityQuestionService.java | 2 +- .../common/rest/api/service/SyncopeService.java | 3 + .../common/rest/api/service/TaskService.java | 5 +- .../rest/api/service/UserSelfService.java | 14 +- .../common/rest/api/service/UserService.java | 12 +- .../rest/api/service/WorkflowService.java | 2 +- .../syncope/core/logic/AbstractAnyLogic.java | 2 +- .../syncope/core/logic/AnyObjectLogic.java | 12 - .../syncope/core/logic/ConfigurationLogic.java | 16 +- .../apache/syncope/core/logic/GroupLogic.java | 12 - .../apache/syncope/core/logic/LoggerLogic.java | 26 ++ .../apache/syncope/core/logic/PolicyLogic.java | 30 +- .../syncope/core/logic/ResourceLogic.java | 36 +- .../apache/syncope/core/logic/UserLogic.java | 41 +- .../syncope/core/logic/init/LoggerLoader.java | 2 +- .../core/logic/report/StaticReportlet.java | 4 +- .../core/logic/report/UserReportlet.java | 8 +- .../apache/syncope/core/misc/DataFormat.java | 117 ----- .../apache/syncope/core/misc/FormatUtils.java | 117 +++++ .../apache/syncope/core/misc/MappingUtils.java | 172 +++----- .../core/misc/jexl/ClassFreeUberspectImpl.java | 2 +- .../syncope/core/misc/jexl/JexlUtils.java | 35 +- .../core/misc/security/AuthDataAccessor.java | 10 +- .../security/SyncopeAuthenticationProvider.java | 6 +- .../persistence/api/ImplementationLookup.java | 2 +- .../core/persistence/api/dao/AnyDAO.java | 2 +- .../core/persistence/api/dao/AnySearchDAO.java | 10 +- .../api/dao/ExternalResourceDAO.java | 5 +- .../core/persistence/api/dao/VirAttrDAO.java | 35 -- .../core/persistence/api/dao/VirSchemaDAO.java | 8 +- .../core/persistence/api/entity/Any.java | 10 +- .../core/persistence/api/entity/AnyUtils.java | 6 +- .../persistence/api/entity/AnyUtilsFactory.java | 2 +- .../core/persistence/api/entity/Attr.java | 2 +- .../core/persistence/api/entity/DerAttr.java | 2 +- .../api/entity/DynGroupMembership.java | 2 +- .../persistence/api/entity/DynMembership.java | 2 +- .../api/entity/LinkingMappingItem.java | 140 ++++++ .../core/persistence/api/entity/Membership.java | 2 +- .../core/persistence/api/entity/PlainAttr.java | 2 +- .../persistence/api/entity/Relationship.java | 2 +- .../core/persistence/api/entity/VirAttr.java | 30 -- .../core/persistence/api/entity/VirSchema.java | 13 + .../api/entity/anyobject/AVirAttr.java | 25 -- .../api/entity/anyobject/AnyObject.java | 2 +- .../core/persistence/api/entity/conf/Conf.java | 3 +- .../persistence/api/entity/group/GVirAttr.java | 25 -- .../persistence/api/entity/group/Group.java | 14 +- .../api/entity/task/PropagationTask.java | 4 + .../persistence/api/entity/user/UVirAttr.java | 25 -- .../core/persistence/api/entity/user/User.java | 14 +- .../jpa/content/ContentLoaderHandler.java | 6 +- .../jpa/content/MultiParentNode.java | 2 +- .../jpa/content/XMLContentExporter.java | 10 +- .../persistence/jpa/dao/AbstractAnyDAO.java | 11 +- .../persistence/jpa/dao/JPAAnySearchDAO.java | 12 +- .../core/persistence/jpa/dao/JPAConfDAO.java | 28 +- .../core/persistence/jpa/dao/JPADerAttrDAO.java | 2 +- .../jpa/dao/JPAExternalResourceDAO.java | 29 +- .../core/persistence/jpa/dao/JPAGroupDAO.java | 2 +- .../persistence/jpa/dao/JPAPlainAttrDAO.java | 2 +- .../jpa/dao/JPAPlainAttrValueDAO.java | 7 +- .../core/persistence/jpa/dao/JPAVirAttrDAO.java | 86 ---- .../persistence/jpa/dao/JPAVirSchemaDAO.java | 35 +- .../core/persistence/jpa/dao/SearchSupport.java | 2 +- .../persistence/jpa/entity/AbstractAny.java | 17 +- .../persistence/jpa/entity/AbstractAttr.java | 2 +- .../persistence/jpa/entity/AbstractDerAttr.java | 2 +- .../jpa/entity/AbstractDynMembership.java | 2 +- .../persistence/jpa/entity/AbstractExec.java | 4 +- .../jpa/entity/AbstractPlainAttr.java | 2 +- .../jpa/entity/AbstractPlainAttrValue.java | 18 +- .../persistence/jpa/entity/AbstractVirAttr.java | 71 --- .../jpa/entity/AnnotatedEntityListener.java | 4 +- .../persistence/jpa/entity/JPAAnyUtils.java | 52 +-- .../jpa/entity/JPAAnyUtilsFactory.java | 2 +- .../persistence/jpa/entity/JPAConnInstance.java | 9 +- .../persistence/jpa/entity/JPADerSchema.java | 4 +- .../jpa/entity/JPAEntityFactory.java | 8 - .../persistence/jpa/entity/JPANotification.java | 4 +- .../persistence/jpa/entity/JPAPlainSchema.java | 5 +- .../persistence/jpa/entity/JPAVirSchema.java | 40 ++ .../anyobject/JPAAPlainAttrUniqueValue.java | 2 +- .../entity/anyobject/JPAAPlainAttrValue.java | 2 +- .../jpa/entity/anyobject/JPAAVirAttr.java | 59 --- .../jpa/entity/anyobject/JPAAnyObject.java | 24 +- .../entity/conf/JPACPlainAttrUniqueValue.java | 2 +- .../jpa/entity/conf/JPACPlainAttrValue.java | 2 +- .../persistence/jpa/entity/conf/JPAConf.java | 21 - .../entity/group/JPAGPlainAttrUniqueValue.java | 2 +- .../jpa/entity/group/JPAGPlainAttrValue.java | 2 +- .../jpa/entity/group/JPAGVirAttr.java | 59 --- .../persistence/jpa/entity/group/JPAGroup.java | 24 +- .../entity/resource/JPAExternalResource.java | 16 +- .../jpa/entity/resource/JPAMapping.java | 27 +- .../jpa/entity/resource/JPAMappingItem.java | 11 +- .../jpa/entity/resource/JPAProvision.java | 1 - .../jpa/entity/task/JPAPropagationTask.java | 12 + .../entity/user/JPAUPlainAttrUniqueValue.java | 2 +- .../jpa/entity/user/JPAUPlainAttrValue.java | 2 +- .../jpa/entity/user/JPAUVirAttr.java | 59 --- .../persistence/jpa/entity/user/JPAUser.java | 24 +- .../entity/ExternalResourceValidator.java | 77 +++- .../jpa/validation/entity/PlainAttrCheck.java | 2 +- .../validation/entity/PlainAttrValidator.java | 2 +- .../resources/META-INF/spring-orm-oracle.xml | 25 -- .../resources/META-INF/spring-orm-sqlserver.xml | 25 -- .../src/main/resources/META-INF/spring-orm.xml | 25 -- .../main/resources/domains/MasterContent.xml | 6 + .../src/main/resources/indexes.xml | 4 - .../persistence/jpa/inner/AnyObjectTest.java | 5 + .../persistence/jpa/inner/MultitenancyTest.java | 2 +- .../persistence/jpa/inner/PlainAttrTest.java | 1 - .../persistence/jpa/inner/PlainSchemaTest.java | 2 +- .../persistence/jpa/inner/ResourceTest.java | 46 ++ .../core/persistence/jpa/inner/TaskTest.java | 1 + .../core/persistence/jpa/inner/VirAttrTest.java | 118 ----- .../persistence/jpa/inner/VirSchemaTest.java | 24 +- .../persistence/jpa/outer/ResourceTest.java | 15 +- .../core/persistence/jpa/outer/TaskTest.java | 1 + .../persistence/jpa/outer/VirSchemaTest.java | 76 ++++ .../test/resources/domains/MasterContent.xml | 37 +- .../src/test/resources/domains/TwoContent.xml | 6 + .../core/provisioning/api/Connector.java | 27 +- .../core/provisioning/api/VirAttrHandler.java | 52 +-- .../api/cache/VirAttrCacheValue.java | 36 +- .../api/data/ConfigurationDataBinder.java | 4 +- .../provisioning/api/data/UserDataBinder.java | 2 + .../api/propagation/PropagationManager.java | 5 +- .../core/provisioning/api/sync/PushActions.java | 20 +- .../provisioning/java/ConnectorFacadeProxy.java | 29 +- .../DefaultAnyObjectProvisioningManager.java | 18 - .../java/DefaultGroupProvisioningManager.java | 18 - .../java/DefaultUserProvisioningManager.java | 46 +- .../provisioning/java/VirAttrHandlerImpl.java | 356 +++------------ .../java/data/AbstractAnyDataBinder.java | 138 +++--- .../java/data/AnyObjectDataBinderImpl.java | 11 +- .../java/data/ConfigurationDataBinderImpl.java | 21 +- .../java/data/GroupDataBinderImpl.java | 11 +- .../java/data/ResourceDataBinderImpl.java | 60 ++- .../java/data/SchemaDataBinderImpl.java | 34 +- .../java/data/UserDataBinderImpl.java | 33 +- .../core/provisioning/java/job/TaskJob.java | 4 +- .../notification/NotificationManagerImpl.java | 26 +- .../AbstractPropagationTaskExecutor.java | 89 ++-- .../propagation/PropagationManagerImpl.java | 254 +++++------ .../java/sync/AbstractPushResultHandler.java | 57 +-- .../java/sync/AbstractSyncResultHandler.java | 42 +- .../java/sync/AbstractSyncopeResultHandler.java | 2 +- .../sync/AnyObjectPushResultHandlerImpl.java | 4 +- .../sync/AnyObjectSyncResultHandlerImpl.java | 2 +- .../java/sync/DefaultPushActions.java | 16 +- .../java/sync/GroupPushResultHandlerImpl.java | 4 +- .../java/sync/GroupSyncResultHandlerImpl.java | 2 +- .../provisioning/java/sync/PushJobDelegate.java | 4 +- .../provisioning/java/sync/SyncJobDelegate.java | 31 +- .../core/provisioning/java/sync/SyncUtils.java | 12 +- .../java/sync/UserPushResultHandlerImpl.java | 6 +- .../java/sync/UserSyncResultHandlerImpl.java | 2 +- core/rest-cxf/pom.xml | 311 +++++++------ .../rest/cxf/ThreadLocalCleanupListener.java | 4 +- .../syncope/core/rest/cxf/WADLServlet.java | 118 +++++ .../rest/cxf/service/AbstractAnyService.java | 9 +- .../cxf/service/ConfigurationServiceImpl.java | 4 +- .../rest/cxf/service/LoggerServiceImpl.java | 16 +- .../rest/cxf/service/PolicyServiceImpl.java | 6 +- .../rest/cxf/service/SchemaServiceImpl.java | 6 +- .../core/rest/cxf/service/TaskServiceImpl.java | 4 +- .../main/resources/META-INF/web-fragment.xml | 12 + .../src/main/resources/restCXFContext.xml | 42 +- .../src/main/resources/wadl2html/index.xsl | 6 +- .../activiti/ActivitiUserWorkflowAdapter.java | 17 +- .../workflow/activiti/task/PasswordReset.java | 24 +- .../core/workflow/activiti/task/Update.java | 21 +- .../core/workflow/api/UserWorkflowAdapter.java | 3 +- .../java/AbstractUserWorkflowAdapter.java | 9 +- .../java/DefaultUserWorkflowAdapter.java | 33 +- deb/core/pom.xml | 6 + .../client/console/panels/CamelRoutePanel.java | 2 +- .../console/rest/CamelRouteRestClient.java | 2 +- .../syncope/common/lib/to/CamelRouteTO.java | 2 + .../processor/AnyObjectUpdateProcessor.java | 20 - .../camel/processor/GroupUpdateProcessor.java | 20 - .../processor/UserConfirmPwdResetProcessor.java | 14 +- .../UserStatusPropagationProcessor.java | 15 +- .../processor/UserUpdateInSyncProcessor.java | 6 +- .../camel/processor/UserUpdateProcessor.java | 26 +- .../rest/api/service/CamelRouteService.java | 25 +- .../rest/cxf/service/CamelRouteServiceImpl.java | 3 +- ext/pom.xml | 1 + ext/swagger-ui/pom.xml | 107 +++++ .../META-INF/resources/swagger/index.html | 163 +++++++ fit/console-reference/pom.xml | 80 +++- fit/core-reference/pom.xml | 146 ++++++- .../core/reference/AuthenticationITCase.java | 24 +- .../fit/core/reference/CamelRouteITCase.java | 2 +- .../fit/core/reference/ConfigurationITCase.java | 18 +- .../syncope/fit/core/reference/GroupITCase.java | 28 +- .../fit/core/reference/LoggerITCase.java | 16 + .../fit/core/reference/MultitenancyITCase.java | 2 +- .../fit/core/reference/PlainSchemaITCase.java | 2 +- .../core/reference/PropagationTaskITCase.java | 8 - .../fit/core/reference/ResourceITCase.java | 11 +- .../fit/core/reference/SyncTaskITCase.java | 61 ++- .../syncope/fit/core/reference/UserITCase.java | 95 ++-- .../fit/core/reference/UserSelfITCase.java | 10 +- .../fit/core/reference/VirAttrITCase.java | 333 +++++++------- .../fit/core/reference/VirSchemaITCase.java | 50 ++- .../syncope/installer/enums/Containers.java | 2 +- .../org/apache/syncope/installer/enums/DBs.java | 2 +- pom.xml | 98 ++--- src/main/asciidoc/docinfo-footer.html | 23 + src/main/asciidoc/getting-started.adoc | 59 +++ .../getting-started/docinfo-footer.html | 23 - .../getting-started/getting-started.adoc | 69 --- .../getting-started/images/architecture.png | Bin 62994 -> 0 bytes .../getting-started/images/architecture.xml | 20 - .../images/identityLifecycle.png | Bin 121230 -> 0 bytes .../asciidoc/getting-started/introduction.adoc | 114 ----- .../getting-started/systemRequirements.adoc | 50 --- src/main/asciidoc/images/architecture.png | Bin 0 -> 62994 bytes src/main/asciidoc/images/architecture.xml | 20 + src/main/asciidoc/images/identityLifecycle.png | Bin 0 -> 121230 bytes src/main/asciidoc/images/installer1.png | Bin 0 -> 160690 bytes src/main/asciidoc/images/installer10.png | Bin 0 -> 45440 bytes src/main/asciidoc/images/installer2.png | Bin 0 -> 53017 bytes src/main/asciidoc/images/installer3.png | Bin 0 -> 46889 bytes src/main/asciidoc/images/installer4.png | Bin 0 -> 38073 bytes src/main/asciidoc/images/installer5.png | Bin 0 -> 48416 bytes src/main/asciidoc/images/installer6.png | Bin 0 -> 39613 bytes src/main/asciidoc/images/installer7.png | Bin 0 -> 40130 bytes src/main/asciidoc/images/installer8.png | Bin 0 -> 41467 bytes src/main/asciidoc/images/installer9.png | Bin 0 -> 42059 bytes src/main/asciidoc/introduction.adoc | 114 +++++ src/main/asciidoc/obtain.adoc | 431 ++++++++++++++++++ src/main/asciidoc/reference-guide.adoc | 148 +++++++ .../reference-guide/docinfo-footer.html | 23 - .../reference-guide/reference-guide.adoc | 148 ------- src/main/asciidoc/systemRequirements.adoc | 51 +++ src/site/xdoc/architecture.xml | 2 +- 381 files changed, 10198 insertions(+), 4432 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java ---------------------------------------------------------------------- diff --cc client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java index 667b525,93aa39a..fa40d42 --- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java @@@ -184,15 -201,12 +184,15 @@@ public class SyncopeConsoleSession exte public <T> T getService(final MediaType mediaType, final Class<T> serviceClass) { T service; - synchronized (clientFactory) { - SyncopeClientFactoryBean.ContentType preType = clientFactory.getContentType(); + synchronized (SyncopeConsoleApplication.get().getClientFactory()) { - SyncopeClientFactoryBean.ContentType preType = - SyncopeConsoleApplication.get().getClientFactory().getContentType(); ++ SyncopeClientFactoryBean.ContentType preType = SyncopeConsoleApplication.get().getClientFactory(). ++ getContentType(); - clientFactory.setContentType(SyncopeClientFactoryBean.ContentType.fromString(mediaType.toString())); - service = clientFactory.create(username, password).getService(serviceClass); - clientFactory.setContentType(preType); + SyncopeConsoleApplication.get().getClientFactory(). + setContentType(SyncopeClientFactoryBean.ContentType.fromString(mediaType.toString())); + service = SyncopeConsoleApplication.get().getClientFactory(). + create(username, password).getService(serviceClass); + SyncopeConsoleApplication.get().getClientFactory().setContentType(preType); } return service; http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/client/console/src/main/java/org/apache/syncope/client/console/pages/Login.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/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 847bd61,c66d650..b5850ad --- 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 @@@ -190,8 -187,8 +190,8 @@@ public class ProvisioningModalPage<T ex private static final long serialVersionUID = 4287357360778016173L; - public StatusBeanProvider() { + StatusBeanProvider() { - super("accountLink"); + super("connObjectLink"); } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java ---------------------------------------------------------------------- diff --cc client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java index 7dbe73e,238f13d..4f5e27a --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/StatusModalPage.java @@@ -489,8 -486,8 +489,8 @@@ public class StatusModalPage<T extends private static final long serialVersionUID = 4586969457669796621L; - public AttributableStatusProvider() { + AttributableStatusProvider() { - super(statusOnly ? "resourceName" : "accountLink"); + super(statusOnly ? "resourceName" : "connObjectLink"); } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractResourceModal.java ---------------------------------------------------------------------- diff --cc client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractResourceModal.java index 15f4f02,1ed9050..21568eb --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractResourceModal.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractResourceModal.java @@@ -38,46 -31,8 +38,46 @@@ public abstract class AbstractResourceM private static final long serialVersionUID = 1734415311027284221L; - public AbstractResourceModal(final ModalWindow window, final PageReference pageRef) { - super(window, pageRef); + protected final List<ITab> tabs; + + public AbstractResourceModal(final BaseModal<?> modal, final PageReference pageRef) { + super(modal, pageRef); + + this.tabs = new ArrayList<>(); + add(new AjaxBootstrapTabbedPanel<ITab>("tabbedPanel", tabs)); + } + + private class AjaxBootstrapTabbedPanel<T extends ITab> + extends de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbedPanel<T> { + + private static final long serialVersionUID = 1L; + - public AjaxBootstrapTabbedPanel(final String id, final List<T> tabs) { ++ AjaxBootstrapTabbedPanel(final String id, final List<T> tabs) { + super(id, tabs); + } + + @Override + protected WebMarkupContainer newLink(final String linkId, final int index) { + return new AjaxSubmitLink(linkId) { + + private static final long serialVersionUID = 1L; + + @Override + protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + setSelectedTab(index); + if (target != null) { + target.add(AjaxBootstrapTabbedPanel.this); + } + onAjaxUpdate(target); + } + + @Override + protected void onError(final AjaxRequestTarget target, final Form<?> form) { + modal.getFeedbackPanel().refresh(target); + } + }; + } + } public static class CreateEvent extends ModalEvent { http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceSecurityPanel.java ---------------------------------------------------------------------- diff --cc client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceSecurityPanel.java index 37cf8ac,89b856a..4d90788 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceSecurityPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceSecurityPanel.java @@@ -150,9 -155,9 +150,9 @@@ public class ResourceSecurityPanel exte private static final long serialVersionUID = 8060500161321947000L; - private PolicyType type; + private final PolicyType type; - public PolicyRenderer(final PolicyType type) { + PolicyRenderer(final PolicyType type) { super(); this.type = type; } http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/client/console/src/main/java/org/apache/syncope/client/console/topology/Topology.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/client/old_console/pom.xml ---------------------------------------------------------------------- diff --cc client/old_console/pom.xml index ac9f17b,ac9f17b..a49170a --- a/client/old_console/pom.xml +++ b/client/old_console/pom.xml @@@ -65,6 -65,6 +65,7 @@@ under the License <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-spring</artifactId> ++ <version>7.0.0</version> <!-- exclude spring framework that wicket pulls in --> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutePanel.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/973cd50f/pom.xml ----------------------------------------------------------------------
