[2/2] syncope git commit: Fixing typo
Fixing typo Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e38c042d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e38c042d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e38c042d Branch: refs/heads/master Commit: e38c042d84035662ab56bf770c148a21f109d17d Parents: a8827b5 Author: Francesco Chicchiriccò Authored: Tue Mar 7 10:19:19 2017 +0100 Committer: Francesco Chicchiriccò Committed: Tue Mar 7 10:19:30 2017 +0100 -- .../reference-guide/workingwithapachesyncope/migration.adoc| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/e38c042d/src/main/asciidoc/reference-guide/workingwithapachesyncope/migration.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/migration.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/migration.adoc index 7d891e3..c2241d2 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/migration.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/migration.adoc @@ -70,18 +70,18 @@ follows: .On GNU / Linux - Mac OS X -./syncopeadm.sh migrate --conf /path/to/context.xml /dest/path/to/MasterContent.xml +./syncopeadm.sh migrate --conf /path/to/content.xml /dest/path/to/MasterContent.xml .On Windows -syncopeadm.bat migrate --conf \path\to\context.xml \dest\path\to\MasterContent.xml +syncopeadm.bat migrate --conf \path\to\content.xml \dest\path\to\MasterContent.xml The result of this invocation is the generated `MasterContent.xml` file and possibly an output message such as the following: -You are running: migrate --conf /path/to/context.xml /dest/path/to/MasterContent.xml +You are running: migrate --conf /path/to/content.xml /dest/path/to/MasterContent.xml Virtual items, require manual intervention:
[1/2] syncope git commit: Fixing typo
Repository: syncope Updated Branches: refs/heads/2_0_X fbeeecd3e -> 72a1f085d refs/heads/master a8827b524 -> e38c042d8 Fixing typo Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/72a1f085 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/72a1f085 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/72a1f085 Branch: refs/heads/2_0_X Commit: 72a1f085d7e955d6d0f1bf893a67d7c43056fa3a Parents: fbeeecd Author: Francesco Chicchiriccò Authored: Tue Mar 7 10:19:19 2017 +0100 Committer: Francesco Chicchiriccò Committed: Tue Mar 7 10:19:19 2017 +0100 -- .../reference-guide/workingwithapachesyncope/migration.adoc| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/72a1f085/src/main/asciidoc/reference-guide/workingwithapachesyncope/migration.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/migration.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/migration.adoc index de351a9..aaa54cd 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/migration.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/migration.adoc @@ -70,18 +70,18 @@ follows: .On GNU / Linux - Mac OS X -./syncopeadm.sh migrate --conf /path/to/context.xml /dest/path/to/MasterContent.xml +./syncopeadm.sh migrate --conf /path/to/content.xml /dest/path/to/MasterContent.xml .On Windows -syncopeadm.bat migrate --conf \path\to\context.xml \dest\path\to\MasterContent.xml +syncopeadm.bat migrate --conf \path\to\content.xml \dest\path\to\MasterContent.xml The result of this invocation is the generated `MasterContent.xml` file and possibly an output message such as the following: -You are running: migrate --conf /path/to/context.xml /dest/path/to/MasterContent.xml +You are running: migrate --conf /path/to/content.xml /dest/path/to/MasterContent.xml Virtual items, require manual intervention:
svn commit: r1785816 - /syncope/site/docs/reference-guide.html
Author: ilgrosso Date: Tue Mar 7 09:20:59 2017 New Revision: 1785816 URL: http://svn.apache.org/viewvc?rev=1785816&view=rev Log: Fixing typo Modified: syncope/site/docs/reference-guide.html Modified: syncope/site/docs/reference-guide.html URL: http://svn.apache.org/viewvc/syncope/site/docs/reference-guide.html?rev=1785816&r1=1785815&r2=1785816&view=diff == --- syncope/site/docs/reference-guide.html (original) +++ syncope/site/docs/reference-guide.html Tue Mar 7 09:20:59 2017 @@ -8019,13 +8019,13 @@ follows: On GNU / Linux - Mac OS X -./syncopeadm.sh migrate --conf /path/to/context.xml /dest/path/to/MasterContent.xml +./syncopeadm.sh migrate --conf /path/to/content.xml /dest/path/to/MasterContent.xml On Windows -syncopeadm.bat migrate --conf \path\to\context.xml \dest\path\to\MasterContent.xml +syncopeadm.bat migrate --conf \path\to\content.xml \dest\path\to\MasterContent.xml @@ -8033,7 +8033,7 @@ follows: -You are running: migrate --conf /path/to/context.xml /dest/path/to/MasterContent.xml +You are running: migrate --conf /path/to/content.xml /dest/path/to/MasterContent.xml Virtual items, require manual intervention:
[CONF] Apache Syncope > [DISCUSS] SAML 2.0 Service Provider feature
Title: Message Title Francesco Chicchiricco created a page [DISCUSS] SAML 2.0 Service Provider feature This page contains topics supporting ongoing discussion at d...@syncope.apache.org. Tracked as SYNCOPE-10XX. Requirements Once this feature is implemented, it will be possible to log into the Admin Console, the Enduser UI (and any other Java EE web application) by using the Web Browser SSO Profile and an external SAML 2.0 Identity Provider. An important requirement is to maintain all authentication / authorization aspects into the Syncope Core. Design The idea is to provide a new Java EE web-fragment named SAML 2.0 SP Agent, meant to be deployed, as separated JAR file, alongside with the Admin Console, the Enduser UI (and any other Java EE web application). The operation's flow will be something like as follows: both for IdP-initiated and SP-initiated scenarios, the new SAML 2.0 SP Agent will take care of the SAML 2.0 assertion exchange with user's browser the actual assertion generation and validation is performed by invoking the Syncope Core via REST (for this reason the IdP metadata will be maintained by the Core); at the end of the process, a JWT (introduced by SYNCOPE-1035) will be returned by the Core to the SAML 2.0 SP Agent the new SAML 2.0 SP Agent will store the JWT received by the Syncope Core into the Java EE web application's session the Java EE web application will use the JWT for invoking the Syncope Core Implementation For several reasons - including the need to introduce additional library dependencies for manipulating SAML 2.0 assertions - the ideal candidate for this implementation is a new extension. The OpenSAML 3.0 library looks like an adequate fit for this job. View page • Add comment • Like Stop watching space • Manage notifications This message was sent by Atlassian Confluence 5.8.4
[CONF] Apache Syncope > [DISCUSS] SAML 2.0 Service Provider feature
Title: Message Title Francesco Chicchiricco edited a page [DISCUSS] SAML 2.0 Service Provider feature Info This page contains topics supporting ongoing discussion at d...@syncope.apache.org. Tracked as SYNCOPE-10XX1041. Requirements Once this feature is implemented, it will be possible to log into the Admin Console, the Enduser UI (and any other Java EE web application) by using the Web Browser SSO Profile and an external SAML 2.0 Identity Provider. ... View page • Add comment • Like Stop watching space • Manage notifications This message was sent by Atlassian Confluence 5.8.4
[CONF] Apache Syncope > [DISCUSS] SAML 2.0 Service Provider feature
Title: Message Title Francesco Chicchiricco edited a page [DISCUSS] SAML 2.0 Service Provider feature ... both for IdP-initiated and SP-initiated scenarios, the new SAML 2.0 SP Agent will take care of the SAML 2.0 assertion exchange with user's browser the actual assertion generation and validation is performed by invoking the Syncope Core via REST (for this reason the IdP metadata will be maintained by the Core); at the end of the process, a JWT (introduced by SYNCOPE-1035) will be returned by the Core to the SAML 2.0 SP Agent the new SAML 2.0 SP Agent will store the JWT received by the Syncope Core into the Java EE web application's session the Java EE web application will use the JWT for invoking the Syncope Core Image Added Implementation For several reasons - including the need to introduce additional library dependencies for manipulating SAML 2.0 assertions - the ideal candidate for this implementation is a new extension. ... View page • Add comment • Like Stop watching space • Manage notifications This message was sent by Atlassian Confluence 5.8.4
[1/2] syncope git commit: [SYNCOPE-1039] provides on_change event handling to be used to update the field model
Repository: syncope Updated Branches: refs/heads/2_0_X 72a1f085d -> 036243b46 refs/heads/master e38c042d8 -> bfcac4bbd [SYNCOPE-1039] provides on_change event handling to be used to update the field model Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/036243b4 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/036243b4 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/036243b4 Branch: refs/heads/2_0_X Commit: 036243b4637e9eca904446acdc669a96f9282723 Parents: 72a1f08 Author: fmartelli Authored: Tue Mar 7 12:15:20 2017 +0100 Committer: fmartelli Committed: Tue Mar 7 12:15:20 2017 +0100 -- .../client/console/panels/ConnObjects.java | 2 +- .../client/console/panels/VirSchemaDetails.java | 4 +-- .../console/status/ResourceStatusModal.java | 3 +- .../html/form/AjaxDropDownChoicePanel.java | 8 + .../markup/html/form/AjaxSpinnerFieldPanel.java | 31 ++-- .../markup/html/form/EncryptedFieldPanel.java | 25 .../client/console/wizards/any/PlainAttrs.java | 12 7 files changed, 72 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/036243b4/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java index af491e7..17d5036 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java @@ -60,7 +60,7 @@ public class ConnObjects extends Panel implements ModalPanel { } }, new ArrayList()); -anyTypes = new AjaxDropDownChoicePanel<>("anyTypes", "anyTypes", new Model(), true); +anyTypes = new AjaxDropDownChoicePanel<>("anyTypes", "anyTypes", new Model()); anyTypes.setChoices(availableAnyTypes); anyTypes.hideLabel(); anyTypes.setNullValid(false); http://git-wip-us.apache.org/repos/asf/syncope/blob/036243b4/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java index 5c712e2..34cc61c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java @@ -70,7 +70,7 @@ public class VirSchemaDetails extends AbstractSchemaDetailsPanel { schemaForm.add(readonly); final AjaxDropDownChoicePanel resource = new AjaxDropDownChoicePanel<>( -"resource", getString("resource"), new PropertyModel(schemaTO, "resource")). +"resource", getString("resource"), new PropertyModel(schemaTO, "resource"), false). setNullValid(false); resource.setChoices(CollectionUtils.collect(resourceRestClient.list(), EntityTOUtils.keyTransformer(), new ArrayList())); @@ -82,7 +82,7 @@ public class VirSchemaDetails extends AbstractSchemaDetailsPanel { schemaForm.add(resource); anyType = new AjaxDropDownChoicePanel<>( -"anyType", getString("anyType"), new PropertyModel(schemaTO, "anyType")). +"anyType", getString("anyType"), new PropertyModel(schemaTO, "anyType"), false). setNullValid(false); anyType.setChoices(new ArrayList<>(anyTypes.keySet())); anyType.setOutputMarkupId(true); http://git-wip-us.apache.org/repos/asf/syncope/blob/036243b4/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java index ea07105..d3a61d1 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java @@ -62,7 +62,8 @@ public class ResourceStatusModal extends StatusModal { } }; -AjaxDropDownChoicePanel anyTypes = new AjaxDropDownChoi
[2/2] syncope git commit: [SYNCOPE-1039] provides on_change event handling to be used to update the field model
[SYNCOPE-1039] provides on_change event handling to be used to update the field model Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bfcac4bb Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bfcac4bb Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bfcac4bb Branch: refs/heads/master Commit: bfcac4bbd4a8007ee2df3bf4c61e667c2d1215b2 Parents: e38c042 Author: fmartelli Authored: Tue Mar 7 12:15:20 2017 +0100 Committer: fmartelli Committed: Tue Mar 7 12:15:39 2017 +0100 -- .../client/console/panels/ConnObjects.java | 2 +- .../client/console/panels/VirSchemaDetails.java | 4 +-- .../console/status/ResourceStatusModal.java | 3 +- .../html/form/AjaxDropDownChoicePanel.java | 8 + .../markup/html/form/AjaxSpinnerFieldPanel.java | 31 ++-- .../markup/html/form/EncryptedFieldPanel.java | 25 .../client/console/wizards/any/PlainAttrs.java | 12 7 files changed, 72 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/bfcac4bb/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java index af491e7..17d5036 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java @@ -60,7 +60,7 @@ public class ConnObjects extends Panel implements ModalPanel { } }, new ArrayList()); -anyTypes = new AjaxDropDownChoicePanel<>("anyTypes", "anyTypes", new Model(), true); +anyTypes = new AjaxDropDownChoicePanel<>("anyTypes", "anyTypes", new Model()); anyTypes.setChoices(availableAnyTypes); anyTypes.hideLabel(); anyTypes.setNullValid(false); http://git-wip-us.apache.org/repos/asf/syncope/blob/bfcac4bb/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java index 5c712e2..34cc61c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/VirSchemaDetails.java @@ -70,7 +70,7 @@ public class VirSchemaDetails extends AbstractSchemaDetailsPanel { schemaForm.add(readonly); final AjaxDropDownChoicePanel resource = new AjaxDropDownChoicePanel<>( -"resource", getString("resource"), new PropertyModel(schemaTO, "resource")). +"resource", getString("resource"), new PropertyModel(schemaTO, "resource"), false). setNullValid(false); resource.setChoices(CollectionUtils.collect(resourceRestClient.list(), EntityTOUtils.keyTransformer(), new ArrayList())); @@ -82,7 +82,7 @@ public class VirSchemaDetails extends AbstractSchemaDetailsPanel { schemaForm.add(resource); anyType = new AjaxDropDownChoicePanel<>( -"anyType", getString("anyType"), new PropertyModel(schemaTO, "anyType")). +"anyType", getString("anyType"), new PropertyModel(schemaTO, "anyType"), false). setNullValid(false); anyType.setChoices(new ArrayList<>(anyTypes.keySet())); anyType.setOutputMarkupId(true); http://git-wip-us.apache.org/repos/asf/syncope/blob/bfcac4bb/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java index ea07105..d3a61d1 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java @@ -62,7 +62,8 @@ public class ResourceStatusModal extends StatusModal { } }; -AjaxDropDownChoicePanel anyTypes = new AjaxDropDownChoicePanel<>("anyTypes", "anyTypes", typeModel); +AjaxDropDownChoicePanel anyTypes += new AjaxDropDownC
[2/2] syncope git commit: Minor fix
Minor fix Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/eb4cb448 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/eb4cb448 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/eb4cb448 Branch: refs/heads/master Commit: eb4cb44854fb1798e3d5fcb77f8bdd84629803d8 Parents: bfcac4b Author: Francesco Chicchiriccò Authored: Tue Mar 7 14:00:42 2017 +0100 Committer: Francesco Chicchiriccò Committed: Tue Mar 7 14:00:51 2017 +0100 -- .../console/SyncopeConsoleApplication.java | 22 - .../enduser/SyncopeEnduserApplication.java | 26 ++-- 2 files changed, 24 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/eb4cb448/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java index ce00366..07a80b6 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java @@ -138,24 +138,24 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication { throw new WicketRuntimeException("Could not read " + CONSOLE_PROPERTIES, e); } version = props.getProperty("version"); -Args.notNull(version, " not set"); +Args.notNull(version, ""); site = props.getProperty("site"); -Args.notNull(site, " not set"); +Args.notNull(site, ""); anonymousUser = props.getProperty("anonymousUser"); -Args.notNull(anonymousUser, " not set"); +Args.notNull(anonymousUser, ""); anonymousKey = props.getProperty("anonymousKey"); -Args.notNull(anonymousKey, " not set"); +Args.notNull(anonymousKey, ""); String scheme = props.getProperty("scheme"); -Args.notNull(scheme, " not set"); +Args.notNull(scheme, ""); String host = props.getProperty("host"); -Args.notNull(host, " not set"); +Args.notNull(host, ""); String port = props.getProperty("port"); -Args.notNull(port, " not set"); +Args.notNull(port, ""); String rootPath = props.getProperty("rootPath"); -Args.notNull(rootPath, " not set"); +Args.notNull(rootPath, ""); String useGZIPCompression = props.getProperty("useGZIPCompression"); -Args.notNull(rootPath, " not set"); +Args.notNull(useGZIPCompression, ""); clientFactory = new SyncopeClientFactoryBean(). setAddress(scheme + "://" + host + ":" + port + "/" + rootPath). @@ -197,14 +197,14 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication { mountPage("/login", getSignInPageClass()); activitiModelerDirectory = props.getProperty("activitiModelerDirectory"); -Args.notNull(activitiModelerDirectory, " not set"); +Args.notNull(activitiModelerDirectory, ""); try { reconciliationReportKey = props.getProperty("reconciliationReportKey"); } catch (NumberFormatException e) { LOG.error("While parsing reconciliationReportKey", e); } -Args.notNull(reconciliationReportKey, " not set"); +Args.notNull(reconciliationReportKey, ""); mountResource("/" + ACTIVITI_MODELER_CONTEXT, new ResourceReference(ACTIVITI_MODELER_CONTEXT) { http://git-wip-us.apache.org/repos/asf/syncope/blob/eb4cb448/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java index 3094e3c..55375bc 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java @@ -105,35 +105,35 @@ public class SyncopeEnduserApplication extends WebApplication implements Seriali throw new WicketRuntimeException("Could not read " + ENDUSER_PROPERTIES, e); } version = props.getProperty("version"); -Args.notNull(version, " not set"); +Args.notNull(version, ""); site = props.getProperty("site"); -Args.notNull(site, " not set");
[1/2] syncope git commit: Minor fix
Repository: syncope Updated Branches: refs/heads/2_0_X 036243b46 -> 658141b2e refs/heads/master bfcac4bbd -> eb4cb4485 Minor fix Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/658141b2 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/658141b2 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/658141b2 Branch: refs/heads/2_0_X Commit: 658141b2e301fdf8f0ba76d3e91215ea227d182e Parents: 036243b Author: Francesco Chicchiriccò Authored: Tue Mar 7 14:00:42 2017 +0100 Committer: Francesco Chicchiriccò Committed: Tue Mar 7 14:00:42 2017 +0100 -- .../console/SyncopeConsoleApplication.java | 22 - .../enduser/SyncopeEnduserApplication.java | 26 ++-- 2 files changed, 24 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/658141b2/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java index ce00366..07a80b6 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java @@ -138,24 +138,24 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication { throw new WicketRuntimeException("Could not read " + CONSOLE_PROPERTIES, e); } version = props.getProperty("version"); -Args.notNull(version, " not set"); +Args.notNull(version, ""); site = props.getProperty("site"); -Args.notNull(site, " not set"); +Args.notNull(site, ""); anonymousUser = props.getProperty("anonymousUser"); -Args.notNull(anonymousUser, " not set"); +Args.notNull(anonymousUser, ""); anonymousKey = props.getProperty("anonymousKey"); -Args.notNull(anonymousKey, " not set"); +Args.notNull(anonymousKey, ""); String scheme = props.getProperty("scheme"); -Args.notNull(scheme, " not set"); +Args.notNull(scheme, ""); String host = props.getProperty("host"); -Args.notNull(host, " not set"); +Args.notNull(host, ""); String port = props.getProperty("port"); -Args.notNull(port, " not set"); +Args.notNull(port, ""); String rootPath = props.getProperty("rootPath"); -Args.notNull(rootPath, " not set"); +Args.notNull(rootPath, ""); String useGZIPCompression = props.getProperty("useGZIPCompression"); -Args.notNull(rootPath, " not set"); +Args.notNull(useGZIPCompression, ""); clientFactory = new SyncopeClientFactoryBean(). setAddress(scheme + "://" + host + ":" + port + "/" + rootPath). @@ -197,14 +197,14 @@ public class SyncopeConsoleApplication extends AuthenticatedWebApplication { mountPage("/login", getSignInPageClass()); activitiModelerDirectory = props.getProperty("activitiModelerDirectory"); -Args.notNull(activitiModelerDirectory, " not set"); +Args.notNull(activitiModelerDirectory, ""); try { reconciliationReportKey = props.getProperty("reconciliationReportKey"); } catch (NumberFormatException e) { LOG.error("While parsing reconciliationReportKey", e); } -Args.notNull(reconciliationReportKey, " not set"); +Args.notNull(reconciliationReportKey, ""); mountResource("/" + ACTIVITI_MODELER_CONTEXT, new ResourceReference(ACTIVITI_MODELER_CONTEXT) { http://git-wip-us.apache.org/repos/asf/syncope/blob/658141b2/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java index 3094e3c..55375bc 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java @@ -105,35 +105,35 @@ public class SyncopeEnduserApplication extends WebApplication implements Seriali throw new WicketRuntimeException("Could not read " + ENDUSER_PROPERTIES, e); } version = props.getProperty("version"); -Args.notNull(version, " not se
[1/4] syncope git commit: [SYNCOPE-1034] fixes type extension model object handling
Repository: syncope Updated Branches: refs/heads/2_0_X 658141b2e -> 166c4910b refs/heads/master eb4cb4485 -> 166b2f9f9 [SYNCOPE-1034] fixes type extension model object handling Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c6e10f92 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c6e10f92 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c6e10f92 Branch: refs/heads/master Commit: c6e10f92ffb37391c6509725838e8d61aaac7fab Parents: bfcac4b Author: fmartelli Authored: Tue Mar 7 15:01:20 2017 +0100 Committer: fmartelli Committed: Tue Mar 7 15:01:20 2017 +0100 -- .../panels/TypeExtensionDirectoryPanel.java | 18 +++ .../wizards/any/TypeExtensionWizardBuilder.java | 32 +++- 2 files changed, 36 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/c6e10f92/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java index 5333eef..2eefdfc 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java @@ -198,4 +198,22 @@ public class TypeExtensionDirectoryPanel } } + +@Override +protected void customActionCallback(final AjaxRequestTarget target) { +// change modal foter visibility +send(TypeExtensionDirectoryPanel.this, Broadcast.BUBBLE, new BaseModal.ChangeFooterVisibilityEvent(target)); +} + +@Override +protected void customActionOnCancelCallback(final AjaxRequestTarget target) { +// change modal foter visibility +send(TypeExtensionDirectoryPanel.this, Broadcast.BUBBLE, new BaseModal.ChangeFooterVisibilityEvent(target)); +} + +@Override +protected void customActionOnFinishCallback(final AjaxRequestTarget target) { +// change modal foter visibility +send(TypeExtensionDirectoryPanel.this, Broadcast.BUBBLE, new BaseModal.ChangeFooterVisibilityEvent(target)); +} } http://git-wip-us.apache.org/repos/asf/syncope/blob/c6e10f92/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/TypeExtensionWizardBuilder.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/TypeExtensionWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/TypeExtensionWizardBuilder.java index fb0106e..fc69e26 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/TypeExtensionWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/TypeExtensionWizardBuilder.java @@ -18,9 +18,11 @@ */ package org.apache.syncope.client.console.wizards.any; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.Predicate; import org.apache.syncope.client.console.rest.AnyTypeClassRestClient; import org.apache.syncope.client.console.rest.AnyTypeRestClient; @@ -65,32 +67,34 @@ public class TypeExtensionWizardBuilder extends AjaxWizardBuilder typeExtensions += ListUtils.select(groupTO.getTypeExtensions(), new Predicate() { + +@Override +public boolean evaluate(final TypeExtensionTO object) { +return !object.getAnyType().equals(modelObject.getAnyType()); +} +}); +typeExtensions.add(modelObject); +groupTO.getTypeExtensions().clear(); +groupTO.getTypeExtensions().addAll(typeExtensions); +return groupTO; } public class Details extends WizardStep { private static final long serialVersionUID = 6472869166547883903L; -public Details(final String anyType) { +public Details(final TypeExtensionTO typeExtensionTO) { super(); setOutputMarkupId(true); -TypeExtensionTO typeExtensionTO; -if (groupTO.getTypeExtension(anyType) == null) { -typeExtensionTO = new TypeExtensionTO(); -typeExtensionTO.setAnyType(anyType); -groupTO.getTypeExtensions().add(typeExtensionTO); -
[2/4] syncope git commit: [SYNCOPE-1034] fixes type extension model object handling
[SYNCOPE-1034] fixes type extension model object handling Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/611b73b5 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/611b73b5 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/611b73b5 Branch: refs/heads/2_0_X Commit: 611b73b5489f24721927a19e2116c20311c6d0e9 Parents: 036243b Author: fmartelli Authored: Tue Mar 7 15:01:20 2017 +0100 Committer: fmartelli Committed: Tue Mar 7 15:01:43 2017 +0100 -- .../panels/TypeExtensionDirectoryPanel.java | 18 +++ .../wizards/any/TypeExtensionWizardBuilder.java | 32 +++- 2 files changed, 36 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/611b73b5/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java index 5333eef..2eefdfc 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java @@ -198,4 +198,22 @@ public class TypeExtensionDirectoryPanel } } + +@Override +protected void customActionCallback(final AjaxRequestTarget target) { +// change modal foter visibility +send(TypeExtensionDirectoryPanel.this, Broadcast.BUBBLE, new BaseModal.ChangeFooterVisibilityEvent(target)); +} + +@Override +protected void customActionOnCancelCallback(final AjaxRequestTarget target) { +// change modal foter visibility +send(TypeExtensionDirectoryPanel.this, Broadcast.BUBBLE, new BaseModal.ChangeFooterVisibilityEvent(target)); +} + +@Override +protected void customActionOnFinishCallback(final AjaxRequestTarget target) { +// change modal foter visibility +send(TypeExtensionDirectoryPanel.this, Broadcast.BUBBLE, new BaseModal.ChangeFooterVisibilityEvent(target)); +} } http://git-wip-us.apache.org/repos/asf/syncope/blob/611b73b5/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/TypeExtensionWizardBuilder.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/TypeExtensionWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/TypeExtensionWizardBuilder.java index fb0106e..fc69e26 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/TypeExtensionWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/TypeExtensionWizardBuilder.java @@ -18,9 +18,11 @@ */ package org.apache.syncope.client.console.wizards.any; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.Predicate; import org.apache.syncope.client.console.rest.AnyTypeClassRestClient; import org.apache.syncope.client.console.rest.AnyTypeRestClient; @@ -65,32 +67,34 @@ public class TypeExtensionWizardBuilder extends AjaxWizardBuilder typeExtensions += ListUtils.select(groupTO.getTypeExtensions(), new Predicate() { + +@Override +public boolean evaluate(final TypeExtensionTO object) { +return !object.getAnyType().equals(modelObject.getAnyType()); +} +}); +typeExtensions.add(modelObject); +groupTO.getTypeExtensions().clear(); +groupTO.getTypeExtensions().addAll(typeExtensions); +return groupTO; } public class Details extends WizardStep { private static final long serialVersionUID = 6472869166547883903L; -public Details(final String anyType) { +public Details(final TypeExtensionTO typeExtensionTO) { super(); setOutputMarkupId(true); -TypeExtensionTO typeExtensionTO; -if (groupTO.getTypeExtension(anyType) == null) { -typeExtensionTO = new TypeExtensionTO(); -typeExtensionTO.setAnyType(anyType); -groupTO.getTypeExtensions().add(typeExtensionTO); -} else { -typeExtensionTO = groupTO.getTypeExtension(anyType); -} - add(new Label("a
[3/4] syncope git commit: Merge branch '2_0_X' of https://git-wip-us.apache.org/repos/asf/syncope into 2_0_X
Merge branch '2_0_X' of https://git-wip-us.apache.org/repos/asf/syncope into 2_0_X Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/166c4910 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/166c4910 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/166c4910 Branch: refs/heads/2_0_X Commit: 166c4910b344b8e8f561db6c32dc243adf9895ac Parents: 611b73b 658141b Author: fmartelli Authored: Tue Mar 7 15:03:29 2017 +0100 Committer: fmartelli Committed: Tue Mar 7 15:03:29 2017 +0100 -- .../console/SyncopeConsoleApplication.java | 22 - .../enduser/SyncopeEnduserApplication.java | 26 ++-- 2 files changed, 24 insertions(+), 24 deletions(-) --
[4/4] syncope git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/166b2f9f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/166b2f9f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/166b2f9f Branch: refs/heads/master Commit: 166b2f9f93e7509422a3a370854e5be6c8ef34ec Parents: c6e10f9 eb4cb44 Author: fmartelli Authored: Tue Mar 7 15:03:46 2017 +0100 Committer: fmartelli Committed: Tue Mar 7 15:03:46 2017 +0100 -- .../console/SyncopeConsoleApplication.java | 22 - .../enduser/SyncopeEnduserApplication.java | 26 ++-- 2 files changed, 24 insertions(+), 24 deletions(-) --
syncope git commit: [SYNCOPE-1022] security question special chracters correctly managed
Repository: syncope Updated Branches: refs/heads/master 166b2f9f9 -> d7c848cee [SYNCOPE-1022] security question special chracters correctly managed Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d7c848ce Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d7c848ce Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d7c848ce Branch: refs/heads/master Commit: d7c848cee63695dbf0f63dee6dcc53f52e838b11 Parents: 166b2f9 Author: Andrea Patricelli Authored: Tue Mar 7 16:01:50 2017 +0100 Committer: Andrea Patricelli Committed: Tue Mar 7 16:03:03 2017 +0100 -- .../client/enduser/resources/SecurityQuestionResource.java | 4 ++-- .../resources/META-INF/resources/app/languages/de/static.json| 2 +- .../resources/META-INF/resources/app/languages/en/static.json| 2 +- .../resources/META-INF/resources/app/languages/it/static.json| 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/d7c848ce/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java index d812f72..452f337 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java @@ -63,8 +63,6 @@ public class SecurityQuestionResource extends AbstractBaseResource { //if the username is defined then retrieve its security questions, otherwise retrieve all security questions if (!username.isEmpty()) { final SecurityQuestionTO securityQuestionTO = securityQuestionService.readByUser(username.toString()); -response.setContentType(MediaType.APPLICATION_JSON); -response.setTextEncoding(SyncopeConstants.DEFAULT_ENCODING); response.setWriteCallback(new AbstractResource.WriteCallback() { @Override @@ -84,6 +82,8 @@ public class SecurityQuestionResource extends AbstractBaseResource { }); } +response.setContentType(MediaType.APPLICATION_JSON); +response.setTextEncoding(SyncopeConstants.DEFAULT_ENCODING); response.setStatusCode(Response.Status.OK.getStatusCode()); } catch (Exception e) { LOG.error("Error retrieving security questions", e); http://git-wip-us.apache.org/repos/asf/syncope/blob/d7c848ce/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json -- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json index db47711..6212344 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json +++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json @@ -49,7 +49,7 @@ "NEWUSER": "Neuer Benutzer", "SUCCESSFULLY_CREATED": "erfolgreich erstellt", "SUCCESSFULLY_UPDATED": "erfolgreich aktualisiert", - "PASSWORD_UPDATED": "Passwort erfolgreich aktualisisert", + "PASSWORD_UPDATED": "Passwort erfolgreich reset", "GOBACKHOME": "Hier klicken um zur Homepage zurück zu gelangen", "CONFIRM_REMOVE": "Löschen bestätigen", "own": "Besitzen" http://git-wip-us.apache.org/repos/asf/syncope/blob/d7c848ce/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json -- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json index fe88e0f..076bd6c 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json +++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json @@ -49,7 +49,7 @@ "NEWUSER": "New User", "SUCCESSFULLY_CREATED": "succesfully created", "SUCCESSFULLY_UPDATED": "succesfully updated", - "PASSWORD_UPDATED": ": password succesfully updated", + "PASSWORD_UPDATED": ": password succesfully reset", "GOBACKHOME": "Click on this link to go back to the home page", "CONFIRM_REMOVE": "This will remove the current value. Continue?", "own": "Own" http://git-wip-us.apache.org/repos/asf/syncope/blob
syncope git commit: [SYNCOPE-1022] security question special chracters correctly managed
Repository: syncope Updated Branches: refs/heads/2_0_X 166c4910b -> a1acfbad3 [SYNCOPE-1022] security question special chracters correctly managed Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a1acfbad Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a1acfbad Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a1acfbad Branch: refs/heads/2_0_X Commit: a1acfbad3e9f2cc6912fd3118c7b82149b832df4 Parents: 166c491 Author: Andrea Patricelli Authored: Tue Mar 7 16:01:50 2017 +0100 Committer: Andrea Patricelli Committed: Tue Mar 7 16:01:50 2017 +0100 -- .../client/enduser/resources/SecurityQuestionResource.java | 4 ++-- .../resources/META-INF/resources/app/languages/de/static.json| 2 +- .../resources/META-INF/resources/app/languages/en/static.json| 2 +- .../resources/META-INF/resources/app/languages/it/static.json| 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/a1acfbad/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java index d812f72..452f337 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java @@ -63,8 +63,6 @@ public class SecurityQuestionResource extends AbstractBaseResource { //if the username is defined then retrieve its security questions, otherwise retrieve all security questions if (!username.isEmpty()) { final SecurityQuestionTO securityQuestionTO = securityQuestionService.readByUser(username.toString()); -response.setContentType(MediaType.APPLICATION_JSON); -response.setTextEncoding(SyncopeConstants.DEFAULT_ENCODING); response.setWriteCallback(new AbstractResource.WriteCallback() { @Override @@ -84,6 +82,8 @@ public class SecurityQuestionResource extends AbstractBaseResource { }); } +response.setContentType(MediaType.APPLICATION_JSON); +response.setTextEncoding(SyncopeConstants.DEFAULT_ENCODING); response.setStatusCode(Response.Status.OK.getStatusCode()); } catch (Exception e) { LOG.error("Error retrieving security questions", e); http://git-wip-us.apache.org/repos/asf/syncope/blob/a1acfbad/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json -- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json index db47711..6212344 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json +++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json @@ -49,7 +49,7 @@ "NEWUSER": "Neuer Benutzer", "SUCCESSFULLY_CREATED": "erfolgreich erstellt", "SUCCESSFULLY_UPDATED": "erfolgreich aktualisiert", - "PASSWORD_UPDATED": "Passwort erfolgreich aktualisisert", + "PASSWORD_UPDATED": "Passwort erfolgreich reset", "GOBACKHOME": "Hier klicken um zur Homepage zurück zu gelangen", "CONFIRM_REMOVE": "Löschen bestätigen", "own": "Besitzen" http://git-wip-us.apache.org/repos/asf/syncope/blob/a1acfbad/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json -- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json index fe88e0f..076bd6c 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json +++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json @@ -49,7 +49,7 @@ "NEWUSER": "New User", "SUCCESSFULLY_CREATED": "succesfully created", "SUCCESSFULLY_UPDATED": "succesfully updated", - "PASSWORD_UPDATED": ": password succesfully updated", + "PASSWORD_UPDATED": ": password succesfully reset", "GOBACKHOME": "Click on this link to go back to the home page", "CONFIRM_REMOVE": "This will remove the current value. Continue?", "own": "Own" http://git-wip-us.apache.org/repos/asf/syncope/blob/a
[2/2] syncope git commit: [SYNCOPE-1042] fixes localization method
[SYNCOPE-1042] fixes localization method Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d268c1ec Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d268c1ec Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d268c1ec Branch: refs/heads/master Commit: d268c1ec5c281d105e2d257e60d0677362733e0b Parents: d7c848c Author: fmartelli Authored: Tue Mar 7 16:30:57 2017 +0100 Committer: fmartelli Committed: Tue Mar 7 16:31:29 2017 +0100 -- .../client/console/tasks/ExecutionsDirectoryPanel.java| 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/d268c1ec/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java index 4daa2a7..485ee28 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java @@ -88,7 +88,7 @@ public abstract class ExecutionsDirectoryPanel this.key = key; initResultTable(); } - + @Override protected void resultTableCustomChanges(final AjaxDataTablePanel.Builder resultTableBuilder) { resultTableBuilder.setMultiLevelPanel(baseModal, multiLevelPanelRef); @@ -100,13 +100,13 @@ public abstract class ExecutionsDirectoryPanel protected List> getColumns() { final List> columns = new ArrayList<>(); -columns.add(new KeyPropertyColumn(new ResourceModel("key"), "key", "key")); +columns.add(new KeyPropertyColumn(new StringResourceModel("key", this), "key", "key")); -columns.add(new DatePropertyColumn(new ResourceModel("start"), "start", "start")); +columns.add(new DatePropertyColumn(new StringResourceModel("start", this), "start", "start")); -columns.add(new DatePropertyColumn(new ResourceModel("end"), "end", "end")); +columns.add(new DatePropertyColumn(new StringResourceModel("end", this), "end", "end")); -columns.add(new PropertyColumn(new ResourceModel("status"), "status", "status")); +columns.add(new PropertyColumn(new StringResourceModel("status", this), "status", "status")); columns.add(new ActionColumn(new ResourceModel("actions")) {
[1/2] syncope git commit: [SYNCOPE-1042] fixes localization method
Repository: syncope Updated Branches: refs/heads/2_0_X a1acfbad3 -> 931405bee refs/heads/master d7c848cee -> d268c1ec5 [SYNCOPE-1042] fixes localization method Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/931405be Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/931405be Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/931405be Branch: refs/heads/2_0_X Commit: 931405bee0febf1322d61cd39405b35ac7d1790d Parents: a1acfba Author: fmartelli Authored: Tue Mar 7 16:30:57 2017 +0100 Committer: fmartelli Committed: Tue Mar 7 16:30:57 2017 +0100 -- .../client/console/tasks/ExecutionsDirectoryPanel.java| 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/931405be/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java index 4daa2a7..485ee28 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java @@ -88,7 +88,7 @@ public abstract class ExecutionsDirectoryPanel this.key = key; initResultTable(); } - + @Override protected void resultTableCustomChanges(final AjaxDataTablePanel.Builder resultTableBuilder) { resultTableBuilder.setMultiLevelPanel(baseModal, multiLevelPanelRef); @@ -100,13 +100,13 @@ public abstract class ExecutionsDirectoryPanel protected List> getColumns() { final List> columns = new ArrayList<>(); -columns.add(new KeyPropertyColumn(new ResourceModel("key"), "key", "key")); +columns.add(new KeyPropertyColumn(new StringResourceModel("key", this), "key", "key")); -columns.add(new DatePropertyColumn(new ResourceModel("start"), "start", "start")); +columns.add(new DatePropertyColumn(new StringResourceModel("start", this), "start", "start")); -columns.add(new DatePropertyColumn(new ResourceModel("end"), "end", "end")); +columns.add(new DatePropertyColumn(new StringResourceModel("end", this), "end", "end")); -columns.add(new PropertyColumn(new ResourceModel("status"), "status", "status")); +columns.add(new PropertyColumn(new StringResourceModel("status", this), "status", "status")); columns.add(new ActionColumn(new ResourceModel("actions")) {
[1/2] syncope git commit: [SYNCOPE-1038] fixes
Repository: syncope Updated Branches: refs/heads/2_0_X 931405bee -> e3ad9a3f7 refs/heads/master d268c1ec5 -> 72f1b3e1a [SYNCOPE-1038] fixes Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/72f1b3e1 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/72f1b3e1 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/72f1b3e1 Branch: refs/heads/master Commit: 72f1b3e1a0a239c042548a2da7c7fac142dab55d Parents: d268c1e Author: fmartelli Authored: Tue Mar 7 16:56:48 2017 +0100 Committer: fmartelli Committed: Tue Mar 7 16:56:48 2017 +0100 -- .../client/console/wizards/AjaxWizardMgtButtonBar.java | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/72f1b3e1/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java index 2509fa3..0a192d9 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java @@ -39,6 +39,8 @@ public class AjaxWizardMgtButtonBar extends WizardButton private final AjaxWizard.Mode mode; +private boolean completed = false; + public AjaxWizardMgtButtonBar(final String id, final AjaxWizard wizard, final AjaxWizard.Mode mode) { super(id, wizard); this.mode = mode; @@ -115,8 +117,13 @@ public class AjaxWizardMgtButtonBar extends WizardButton case READONLY: return false; default: -final IWizardStep activeStep = getWizardModel().getActiveStep(); -return (activeStep != null) && getWizardModel().isLastStep(activeStep) && super.isEnabled(); +if (!completed) { +final IWizardStep activeStep = getWizardModel().getActiveStep(); +completed = (activeStep != null) +&& getWizardModel().isLastStep(activeStep) +&& super.isEnabled(); +} +return completed; } }
[2/2] syncope git commit: [SYNCOPE-1038] fixes
[SYNCOPE-1038] fixes Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e3ad9a3f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e3ad9a3f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e3ad9a3f Branch: refs/heads/2_0_X Commit: e3ad9a3f7f5c4c4f81e1cc4f96ee5c654f093642 Parents: 931405b Author: fmartelli Authored: Tue Mar 7 16:56:48 2017 +0100 Committer: fmartelli Committed: Tue Mar 7 16:57:15 2017 +0100 -- .../client/console/wizards/AjaxWizardMgtButtonBar.java | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/e3ad9a3f/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java index 2509fa3..0a192d9 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java @@ -39,6 +39,8 @@ public class AjaxWizardMgtButtonBar extends WizardButton private final AjaxWizard.Mode mode; +private boolean completed = false; + public AjaxWizardMgtButtonBar(final String id, final AjaxWizard wizard, final AjaxWizard.Mode mode) { super(id, wizard); this.mode = mode; @@ -115,8 +117,13 @@ public class AjaxWizardMgtButtonBar extends WizardButton case READONLY: return false; default: -final IWizardStep activeStep = getWizardModel().getActiveStep(); -return (activeStep != null) && getWizardModel().isLastStep(activeStep) && super.isEnabled(); +if (!completed) { +final IWizardStep activeStep = getWizardModel().getActiveStep(); +completed = (activeStep != null) +&& getWizardModel().isLastStep(activeStep) +&& super.isEnabled(); +} +return completed; } }