You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by gw...@apache.org on 2014/11/10 10:55:59 UTC
[2/2] syncope git commit: Merge branch '1_2_X' of
https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Merge branch '1_2_X' of https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/46d897f0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/46d897f0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/46d897f0
Branch: refs/heads/1_2_X
Commit: 46d897f066840573879adcf1b30d611a9eeb0ce2
Parents: 13a9663 241f9bb
Author: Guido Wimmel <gw...@apache.org>
Authored: Mon Nov 10 10:54:54 2014 +0100
Committer: Guido Wimmel <gw...@apache.org>
Committed: Mon Nov 10 10:54:54 2014 +0100
----------------------------------------------------------------------
archetype/pom.xml | 8 +-
.../archetype-resources/console/pom.xml | 4 +-
.../resources/archetype-resources/core/pom.xml | 4 +-
archetype/src/main/resources/meta-pom.xml | 4 +-
build-tools/pom.xml | 28 +--
.../buildtools/ConnIdStartStopListener.java | 1 -
build-tools/src/main/webapp/WEB-INF/web.xml | 8 +-
client/pom.xml | 8 +-
common/pom.xml | 42 ++--
.../syncope/common/services/RoleService.java | 14 ++
.../common/types/ClientExceptionType.java | 1 +
console/pom.xml | 38 ++--
.../syncope/console/SyncopeApplication.java | 30 ++-
.../syncope/console/commons/AttrLayoutType.java | 105 +++++++++
.../syncope/console/commons/LayoutType.java | 43 ----
.../syncope/console/commons/XMLRolesReader.java | 97 +++++---
.../html/list/ConnConfPropertyListView.java | 152 +++++++++++++
.../syncope/console/pages/AbstractBasePage.java | 6 +-
.../pages/AbstractSchedTaskModalPage.java | 4 +-
.../pages/AbstractSyncTaskModalPage.java | 101 +++++----
.../console/pages/ApprovalModalPage.java | 4 +-
.../console/pages/BulkActionModalPage.java | 6 +-
.../syncope/console/pages/ConfModalPage.java | 111 +++++++++
.../syncope/console/pages/Configuration.java | 145 +++++-------
.../console/pages/ConnectorModalPage.java | 117 +---------
.../console/pages/DerSchemaModalPage.java | 4 +-
.../console/pages/EditUserModalPage.java | 6 +-
.../org/apache/syncope/console/pages/Login.java | 3 +-
.../console/pages/NotificationModalPage.java | 8 +-
.../syncope/console/pages/ReportModalPage.java | 4 +-
.../apache/syncope/console/pages/Reports.java | 20 +-
.../console/pages/ResourceModalPage.java | 11 +-
.../apache/syncope/console/pages/Resources.java | 45 +++-
.../syncope/console/pages/RoleModalPage.java | 23 +-
.../apache/syncope/console/pages/Schema.java | 6 +-
.../syncope/console/pages/SchemaModalPage.java | 4 +-
.../pages/SecurityQuestionModalPage.java | 4 +-
.../org/apache/syncope/console/pages/Todo.java | 8 +-
.../syncope/console/pages/UserModalPage.java | 6 +-
.../org/apache/syncope/console/pages/Users.java | 2 +-
.../console/pages/VirSchemaModalPage.java | 4 +-
.../console/pages/XMLEditorPopupPage.java | 6 +-
.../pages/panels/AbstractSyncTasksPanel.java | 2 +-
.../pages/panels/AttrTemplatesPanel.java | 2 +-
.../console/pages/panels/AttributesPanel.java | 130 +++++------
.../console/pages/panels/LayoutsPanel.java | 77 ++-----
.../console/pages/panels/PoliciesPanel.java | 4 +-
.../pages/panels/ResourceConnConfPanel.java | 226 +++++--------------
.../console/pages/panels/ResourcesPanel.java | 6 +-
.../syncope/console/pages/panels/RolePanel.java | 2 +-
.../console/pages/panels/RoleSummaryPanel.java | 10 +-
.../console/pages/panels/RoleTabPanel.java | 14 +-
.../console/pages/panels/SchedTasks.java | 2 +-
.../console/rest/ConfigurationRestClient.java | 36 ++-
.../syncope/console/rest/RoleRestClient.java | 2 +-
.../syncope/console/rest/SchemaRestClient.java | 130 +++--------
.../markup/html/form/ActionLinksPanel.java | 4 +-
.../markup/html/form/AjaxPalettePanel.java | 10 +-
.../wicket/markup/html/form/NonI18nPalette.java | 12 +-
.../wicket/markup/html/tree/TreeRolePanel.java | 2 +-
console/src/main/resources/authorizations.xml | 8 -
console/src/main/resources/consoleContext.xml | 2 +-
.../syncope/console/pages/ConfModalPage.html | 39 ++++
.../console/pages/ConfModalPage.properties | 17 ++
.../console/pages/ConfModalPage_it.properties | 17 ++
.../pages/ConfModalPage_pt_BR.properties | 17 ++
.../syncope/console/pages/Configuration.html | 25 +-
.../syncope/console/pages/Login.properties | 4 +-
.../syncope/console/pages/Login_it.properties | 4 +-
.../apache/syncope/console/pages/Resources.html | 17 ++
.../syncope/console/pages/RoleModalPage.html | 2 +-
.../wicket/markup/html/form/NonI18nPalette.html | 24 +-
.../WEB-INF/jboss-deployment-structure.xml | 18 +-
console/src/main/webapp/img/add.png | Bin 0 -> 814 bytes
console/src/main/webapp/img/addAll.png | Bin 0 -> 1037 bytes
console/src/main/webapp/img/db_export.png | Bin 1105 -> 16675 bytes
console/src/main/webapp/img/moveDown.png | Bin 0 -> 833 bytes
console/src/main/webapp/img/moveUp.png | Bin 0 -> 834 bytes
console/src/main/webapp/img/remove.png | Bin 0 -> 825 bytes
console/src/main/webapp/img/removeAll.png | Bin 0 -> 1034 bytes
.../console/ConfigurationTestITCase.java | 78 ++++---
.../syncope/console/ConnInstanceTestITCase.java | 4 +-
core-upgrader/pom.xml | 4 +-
core/pom.xml | 101 +++++----
.../impl/AbstractPropagationTaskExecutor.java | 10 +-
.../controller/ConfigurationController.java | 19 +-
.../rest/controller/ConnectorController.java | 23 +-
.../rest/controller/ResourceController.java | 21 +-
.../core/rest/controller/RoleController.java | 27 ++-
.../controller/SecurityQuestionController.java | 4 +-
.../syncope/core/services/RoleServiceImpl.java | 6 +
.../impl/AbstractSubjectPushResultHandler.java | 60 ++---
.../apache/syncope/core/sync/impl/PushJob.java | 15 +-
.../core/sync/impl/RolePushResultHandler.java | 2 +-
.../apache/syncope/core/sync/impl/SyncJob.java | 8 +-
.../apache/syncope/core/util/POJOHelper.java | 2 +-
.../core/util/SyncTokenDeserializer.java | 8 +
.../syncope/core/util/SyncTokenSerializer.java | 59 +++++
.../activiti/ActivitiUserWorkflowAdapter.java | 42 ++--
.../workflow/user/activiti/task/Create.java | 6 +-
.../workflow/user/activiti/task/Delete.java | 2 +-
.../user/activiti/task/GenerateToken.java | 2 +-
.../workflow/user/activiti/task/Notify.java | 8 +-
.../user/activiti/task/PasswordReset.java | 8 +-
.../workflow/user/activiti/task/Update.java | 4 +-
core/src/main/resources/content.xml | 18 +-
core/src/main/resources/log4j2.xml | 2 +-
.../core/persistence/dao/ConnInstanceTest.java | 4 +-
.../core/persistence/dao/EntitlementTest.java | 2 +-
.../core/persistence/dao/ResourceTest.java | 4 +-
.../syncope/core/rest/ConnectorTestITCase.java | 24 +-
.../syncope/core/rest/TaskTestITCase.java | 119 +++++++++-
core/src/test/resources/content.xml | 56 +++--
deb/pom.xml | 6 +-
installer/pom.xml | 30 +--
.../syncope/installer/files/ParentPom.java | 2 +-
installer/src/main/resources/izpack/install.xml | 2 +-
pom.xml | 181 ++++++++-------
standalone/pom.xml | 36 ++-
119 files changed, 1766 insertions(+), 1353 deletions(-)
----------------------------------------------------------------------