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/46aaa9e8 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/46aaa9e8 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/46aaa9e8 Branch: refs/heads/master Commit: 46aaa9e89fa2da3ecc4208f17a4d7d443100d830 Parents: a8a4063 34ec671 Author: Francesco Chicchiriccò <[email protected]> Authored: Tue Jun 9 08:15:16 2015 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Tue Jun 9 08:15:16 2015 +0200 ---------------------------------------------------------------------- client/console/pom.xml | 12 + .../client/console/SyncopeConsoleSession.java | 3 +- .../console/commons/ActionTableCheckGroup.java | 40 + .../commons/AttributableDataProvider.java | 103 ++ .../client/console/commons/JexlHelpUtils.java | 59 + .../client/console/pages/AbstractBasePage.java | 6 + .../console/pages/AbstractStatusModalPage.java | 30 + .../syncope/client/console/pages/BasePage.java | 11 +- .../console/pages/BulkActionModalPage.java | 166 +++ .../pages/BulkActionResultModalPage.java | 99 ++ .../console/pages/ConnectorModalPage.java | 477 +++++++ .../console/pages/ProvisioningModalPage.java | 253 ++++ .../syncope/client/console/pages/Realms.java | 177 +++ .../client/console/pages/ResourceModalPage.java | 204 +++ .../panels/AbstractSearchResultPanel.java | 346 +++++ .../client/console/panels/AccountPolicy.java | 35 + .../console/panels/ActionDataTablePanel.java | 145 +++ .../console/panels/AjaxDataTablePanel.java | 142 +++ .../console/panels/AnnotatedBeanPanel.java | 66 + .../syncope/client/console/panels/Any.java | 35 + .../client/console/panels/Connectors.java | 385 ++++++ .../client/console/panels/DataTablePanel.java | 113 ++ .../client/console/panels/PasswordPolicy.java | 35 + .../syncope/client/console/panels/Realm.java | 49 + .../client/console/panels/RealmDetails.java | 41 + .../console/panels/ResourceConnConfPanel.java | 189 +++ .../console/panels/ResourceDetailsPanel.java | 306 +++++ .../console/panels/ResourceMappingPanel.java | 644 ++++++++++ .../console/panels/ResourceSecurityPanel.java | 186 +++ .../client/console/panels/Resources.java | 485 +++++++ .../console/rest/ConnectorRestClient.java | 6 +- .../client/console/rest/RealmRestClient.java | 38 + .../client/console/topology/Topology.java | 521 ++++++++ .../client/console/topology/TopologyNode.java | 123 ++ .../console/topology/TopologyNodePanel.java | 205 +++ .../topology/TopologyReloadBehavior.java | 61 + .../markup/html/ClearIndicatingAjaxButton.java | 76 ++ .../markup/html/ClearIndicatingAjaxLink.java | 61 + .../repeater/data/table/ActionResultColumn.java | 77 ++ .../data/table/CheckBoxGroupSelectorPanel.java | 34 + .../html/repeater/data/table/CheckBoxPanel.java | 43 + .../repeater/data/table/CheckGroupColumn.java | 54 + .../wicket/markup/html/form/ActionLink.java | 85 ++ .../markup/html/form/ActionLinksPanel.java | 609 +++++++++ .../markup/html/form/AjaxTextFieldPanel.java | 4 +- .../html/form/IndicatingOnConfirmAjaxLink.java | 58 + .../META-INF/resources/css/AdminLTE.css | 602 ++++++--- .../resources/css/AdminLTE_skins/_all-skins.css | 1203 +++++++++++++++--- .../resources/css/AdminLTE_skins/skin-black.css | 66 +- .../resources/css/AdminLTE_skins/skin-blue.css | 32 +- .../resources/css/AdminLTE_skins/skin-green.css | 27 +- .../css/AdminLTE_skins/skin-purple.css | 27 +- .../resources/css/AdminLTE_skins/skin-red.css | 27 +- .../css/AdminLTE_skins/skin-yellow.css | 27 +- .../META-INF/resources/css/fieldstyle.css | 191 +++ .../META-INF/resources/css/syncopeConsole.css | 177 ++- .../META-INF/resources/css/topology.css | 160 +++ .../META-INF/resources/js/AdminLTE-app.min.js | 4 +- .../resources/META-INF/resources/js/topology.js | 244 ++++ .../console/pages/AbstractStatusModalPage.html | 122 ++ .../pages/AbstractStatusModalPage.properties | 19 + .../pages/AbstractStatusModalPage_it.properties | 19 + .../AbstractStatusModalPage_pt_BR.properties | 19 + .../client/console/pages/BaseModalPage.html | 23 +- .../syncope/client/console/pages/BasePage.html | 16 +- .../console/pages/BulkActionModalPage.html | 45 + .../pages/BulkActionModalPage.properties | 17 + .../pages/BulkActionModalPage_it.properties | 17 + .../pages/BulkActionModalPage_pt_BR.properties | 17 + .../pages/BulkActionResultModalPage.html | 57 + .../pages/BulkActionResultModalPage.properties | 19 + .../BulkActionResultModalPage_it.properties | 19 + .../BulkActionResultModalPage_pt_BR.properties | 19 + .../console/pages/ConnectorModalPage.html | 161 +++ .../console/pages/ConnectorModalPage.properties | 43 + .../pages/ConnectorModalPage_it.properties | 43 + .../pages/ConnectorModalPage_pt_BR.properties | 43 + .../syncope/client/console/pages/Realms.html | 79 ++ .../client/console/pages/ResourceModalPage.html | 56 + .../console/pages/ResourceModalPage.properties | 60 + .../pages/ResourceModalPage_it.properties | 60 + .../pages/ResourceModalPage_pt_BR.properties | 60 + .../panels/AbstractSearchResultPanel.html | 43 + .../panels/AbstractSearchResultPanel.properties | 30 + .../AbstractSearchResultPanel_it.properties | 30 + .../AbstractSearchResultPanel_pt_BR.properties | 30 + .../client/console/panels/AccountPolicy.html | 29 + .../console/panels/ActionDataTablePanel.html | 45 + .../console/panels/AjaxDataTablePanel.html | 47 + .../console/panels/AnnotatedBeanPanel.html | 98 ++ .../panels/AnnotatedBeanPanel.properties | 20 + .../panels/AnnotatedBeanPanel_it.properties | 20 + .../panels/AnnotatedBeanPanel_pt_BR.properties | 20 + .../syncope/client/console/panels/Any.html | 29 + .../client/console/panels/Connectors.html | 57 + .../client/console/panels/Connectors.properties | 34 + .../console/panels/Connectors_it.properties | 34 + .../console/panels/Connectors_pt_BR.properties | 32 + .../client/console/panels/PasswordPolicy.html | 29 + .../syncope/client/console/panels/Realm.html | 93 ++ .../client/console/panels/RealmDetails.html | 45 + .../console/panels/ResourceConnConfPanel.html | 40 + .../console/panels/ResourceDetailsPanel.html | 137 ++ .../console/panels/ResourceMappingPanel.html | 114 ++ .../console/panels/ResourceSecurityPanel.html | 56 + .../panels/ResourceSecurityPanel.properties | 19 + .../panels/ResourceSecurityPanel_it.properties | 19 + .../ResourceSecurityPanel_pt_BR.properties | 19 + .../client/console/panels/Resources.html | 52 + .../client/console/panels/Resources.properties | 34 + .../console/panels/Resources_it.properties | 34 + .../console/panels/Resources_pt_BR.properties | 32 + .../client/console/topology/Topology.html | 52 + .../client/console/topology/Topology.properties | 17 + .../console/topology/TopologyNodePanel.html | 67 + .../topology/TopologyNodePanel.properties | 20 + .../topology/TopologyNodePanel_it.properties | 20 + .../topology/TopologyNodePanel_pt_BR.properties | 20 + .../console/topology/Topology_it.properties | 17 + .../console/topology/Topology_pt_BR.properties | 17 + .../data/table/CheckBoxGroupSelectorPanel.html | 21 + .../html/repeater/data/table/CheckBoxPanel.html | 23 + .../markup/html/form/ActionLinksPanel.html | 173 +++ .../markup/html/form/AjaxCheckBoxPanel.html | 21 + .../html/form/AjaxDropDownChoicePanel.html | 24 + .../markup/html/form/AjaxNumberFieldPanel.html | 22 + .../markup/html/form/AjaxPalettePanel.html | 23 + .../html/form/AjaxPasswordFieldPanel.html | 22 + .../markup/html/form/AjaxTextFieldPanel.html | 23 + .../markup/html/form/AjaxTextFieldPanel_1.html | 23 + .../markup/html/form/BinaryFieldPanel.html | 44 + .../form/CheckBoxMultipleChoiceFieldPanel.html | 23 + .../markup/html/form/DateTextFieldPanel.html | 22 + .../markup/html/form/DateTimeFieldPanel.html | 21 + .../html/form/DateTimeFieldPanel.properties | 17 + .../html/form/DateTimeFieldPanel_it.properties | 17 + .../form/DateTimeFieldPanel_pt_BR.properties | 17 + .../wicket/markup/html/form/FieldPanel.html | 34 + .../wicket/markup/html/form/FieldPanel_1.html | 34 + .../wicket/markup/html/form/LinkPanel.html | 23 + .../wicket/markup/html/form/LinkPanel_1.html | 23 + .../markup/html/form/MappingPurposePanel.html | 31 + .../markup/html/form/MultiFieldPanel.html | 35 + .../markup/html/form/MultiFieldPanel.properties | 22 + .../html/form/MultiFieldPanel_it.properties | 22 + .../html/form/MultiFieldPanel_pt_BR.properties | 22 + .../wicket/markup/html/form/NonI18nPalette.html | 69 + .../markup/html/form/SpinnerFieldPanel.html | 29 + .../rest/api/service/ConnectorService.java | 1 - pom.xml | 13 + 150 files changed, 12682 insertions(+), 480 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/46aaa9e8/client/console/src/main/java/org/apache/syncope/client/console/rest/ConnectorRestClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/46aaa9e8/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ConnectorService.java ---------------------------------------------------------------------- diff --cc common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ConnectorService.java index c4de80a,76552e6..07fc6a4 --- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ConnectorService.java +++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ConnectorService.java @@@ -177,9 -176,8 +177,8 @@@ public interface ConnectorService exten */ @POST @Path("check") - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - boolean check(@NotNull ConnInstanceTO connInstanceTO); + BooleanWrap check(@NotNull ConnInstanceTO connInstanceTO); /** * Reload all connector bundles and instances. http://git-wip-us.apache.org/repos/asf/syncope/blob/46aaa9e8/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 805b59e,fe9519d..9011e8d --- a/pom.xml +++ b/pom.xml @@@ -378,7 -379,8 +379,8 @@@ under the License <font-awesome.version>4.3.0</font-awesome.version> <ionicons.version>2.0.1</ionicons.version> <highlightjs.version>8.4-4</highlightjs.version> - <codemirror.version>5.1</codemirror.version> + <codemirror.version>5.3</codemirror.version> + <jsplumb.version>1.6.4</jsplumb.version> <wicket.version>7.0.0-M5</wicket.version> <wicket-jqueryui.version>7.0.0-M5</wicket-jqueryui.version>
