syncope git commit: More various fixes
Repository: syncope Updated Branches: refs/heads/master 8287f0621 -> 2373ccd34 More various fixes Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2373ccd3 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2373ccd3 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2373ccd3 Branch: refs/heads/master Commit: 2373ccd34f874b6640352e7075f1a02601a8f5f5 Parents: 8287f06 Author: Francesco ChicchiriccòAuthored: Thu Mar 17 18:02:10 2016 +0100 Committer: Francesco Chicchiriccò Committed: Thu Mar 17 18:02:10 2016 +0100 -- .../core/persistence/jpa/entity/AbstractExec.java | 3 +++ .../src/test/resources/domains/MasterContent.xml | 6 +++--- .../installer/processes/ContainerProcess.java | 12 ++-- installer/src/main/resources/modelerPom.xml | 6 -- pom.xml | 12 src/main/asciidoc/commondocs/debpackages.adoc | 18 -- src/site/site.xml | 6 ++ 7 files changed, 42 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/2373ccd3/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractExec.java -- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractExec.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractExec.java index 039d1f7..c3c63ee 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractExec.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/AbstractExec.java @@ -19,6 +19,7 @@ package org.apache.syncope.core.persistence.jpa.entity; import java.util.Date; +import javax.persistence.Column; import javax.persistence.Lob; import javax.persistence.MappedSuperclass; @@ -46,12 +47,14 @@ public abstract class AbstractExec extends AbstractEntity implements Exec */ @NotNull @Temporal(TemporalType.TIMESTAMP) +@Column(name = "startDate") protected Date start; /** * End instant of this execution. */ @Temporal(TemporalType.TIMESTAMP) +@Column(name = "endDate") protected Date end; @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/2373ccd3/core/persistence-jpa/src/test/resources/domains/MasterContent.xml -- diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml index 805bc4c..0e1805d 100644 --- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml +++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml @@ -973,7 +973,7 @@ under the License. - + @@ -992,7 +992,7 @@ under the License. - + @@ -2312,7 +2312,7 @@ $$ } - + http://git-wip-us.apache.org/repos/asf/syncope/blob/2373ccd3/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java -- diff --git a/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java b/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java index 9113c22..ba730d3 100644 --- a/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java +++ b/installer/src/main/java/org/apache/syncope/installer/processes/ContainerProcess.java @@ -244,7 +244,7 @@ public final class ContainerProcess extends BaseProcess { handler.logOutput("Core successfully deployed ", true); InstallLog.getInstance().info("Core successfully deployed "); } else { -String messageError = "Deploy core on Tomcat failed"; +String messageError = "Core deploy failed"; handler.emitError(messageError, messageError); InstallLog.getInstance().error(messageError); } @@ -254,7 +254,7 @@ public final class ContainerProcess extends BaseProcess { handler.logOutput("Console successfully deployed ", true); InstallLog.getInstance().info("Console successfully deployed "); } else { -final String messageError = "Deploy console on Tomcat failed"; +final String messageError = "Console deploy failed"; handler.emitError(messageError, messageError);
[2/2] syncope git commit: Various small fixes and improvements
Various small fixes and improvements Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/96fd9f55 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/96fd9f55 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/96fd9f55 Branch: refs/heads/master Commit: 96fd9f55c3ecb04d6727bae018b821f08bc2459d Parents: 2191f29 Author: Francesco ChicchiriccòAuthored: Thu Mar 17 15:19:30 2016 +0100 Committer: Francesco Chicchiriccò Committed: Thu Mar 17 15:19:30 2016 +0100 -- .../syncope/client/console/pages/MustChangePassword.java| 9 +++-- .../client/console/widgets/ReconciliationWidget.java| 3 ++- .../org/apache/syncope/client/console/pages/Login.html | 1 - .../syncope/client/console/pages/MustChangePassword.html| 2 +- .../src/main/resources/META-INF/resources/app/index.html| 5 ++--- .../syncope/common/lib/report/AbstractReportletConf.java| 4 +++- .../org/apache/syncope/common/lib/to/MappingItemTO.java | 6 ++ fit/core-reference/src/main/resources/log4j2.xml| 3 +++ installer/src/main/resources/izpack/html/prerequisites.html | 2 +- installer/src/main/resources/izpack/userInputLang.xml_eng | 4 ++-- installer/src/main/resources/izpack/userInputLang.xml_ita | 4 ++-- 11 files changed, 29 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java index a25636b..455326a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java @@ -20,6 +20,8 @@ package org.apache.syncope.client.console.pages; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.console.SyncopeConsoleSession; +import org.apache.syncope.client.console.commons.Constants; +import org.apache.syncope.client.console.panels.NotificationPanel; import org.apache.syncope.client.console.rest.UserSelfRestClient; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxPasswordFieldPanel; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -54,6 +56,9 @@ public class MustChangePassword extends WebPage { public MustChangePassword(final PageParameters parameters) { super(parameters); +final NotificationPanel notificationPanel = new NotificationPanel(Constants.FEEDBACK); +add(notificationPanel); + form = new StatelessForm<>("changePassword"); form.setOutputMarkupId(true); @@ -94,13 +99,13 @@ public class MustChangePassword extends WebPage { LOG.error("While changing password for {}", SyncopeConsoleSession.get().getSelfTO().getUsername(), e); error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.getMessage()); - SyncopeConsoleSession.get().getNotificationPanel().refresh(target); +notificationPanel.refresh(target); } } @Override protected void onError(final AjaxRequestTarget target, final Form form) { - SyncopeConsoleSession.get().getNotificationPanel().refresh(target); +notificationPanel.refresh(target); } }; http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java index 8693f39..1e7a4bd 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java @@ -25,6 +25,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Date; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -189,7 +190,7 @@ public class ReconciliationWidget extends BaseWidget { execResult = parseReconciliationReportExec(); } catch
syncope git commit: [SYNCOPE-776] The problem is due to an incomplete step in the release process: when building with -PskipTests, fit/core-reference will be missing Activiti and Camel components; the
Repository: syncope Updated Branches: refs/heads/master 04183d50f -> d72befc59 [SYNCOPE-776] The problem is due to an incomplete step in the release process: when building with -PskipTests, fit/core-reference will be missing Activiti and Camel components; the solution is to use -PskipTests,all Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d72befc5 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d72befc5 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d72befc5 Branch: refs/heads/master Commit: d72befc59157c17da6d05f67d4c84e233fbb413e Parents: 04183d5 Author: Francesco ChicchiriccòAuthored: Thu Mar 17 09:48:25 2016 +0100 Committer: Francesco Chicchiriccò Committed: Thu Mar 17 09:48:25 2016 +0100 -- src/site/xdoc/release-process.xml | 2 +- standalone/pom.xml| 56 +- 2 files changed, 29 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/d72befc5/src/site/xdoc/release-process.xml -- diff --git a/src/site/xdoc/release-process.xml b/src/site/xdoc/release-process.xml index e38b5a8..52b6395 100644 --- a/src/site/xdoc/release-process.xml +++ b/src/site/xdoc/release-process.xml @@ -289,7 +289,7 @@ svn commit -m "Staging artifacts for $VERSION vote"]]>
[1/2] syncope git commit: Upgrading Jackson
Repository: syncope Updated Branches: refs/heads/master d72befc59 -> 96fd9f55c Upgrading Jackson Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2191f29b Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2191f29b Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2191f29b Branch: refs/heads/master Commit: 2191f29b4131da096bdc2ee714940c8f61732792 Parents: d72befc Author: Francesco ChicchiriccòAuthored: Thu Mar 17 15:19:20 2016 +0100 Committer: Francesco Chicchiriccò Committed: Thu Mar 17 15:19:20 2016 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/2191f29b/pom.xml -- diff --git a/pom.xml b/pom.xml index 8fb974b..728eaf9 100644 --- a/pom.xml +++ b/pom.xml @@ -331,7 +331,7 @@ under the License. 2.16.2 -2.7.2 +2.7.3 4.2.5.RELEASE 4.0.4.RELEASE
syncope git commit: Moving from Wildfly 9 to Wildfly 10 for IT: still all green
Repository: syncope Updated Branches: refs/heads/master db624157e -> b8bbd7eb2 Moving from Wildfly 9 to Wildfly 10 for IT: still all green Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b8bbd7eb Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b8bbd7eb Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b8bbd7eb Branch: refs/heads/master Commit: b8bbd7eb23c2730871abdeb172ed4920fddbdd1b Parents: db62415 Author: Francesco ChicchiriccòAuthored: Sat Mar 19 12:20:06 2016 +0100 Committer: Francesco Chicchiriccò Committed: Sat Mar 19 12:20:06 2016 +0100 -- fit/core-reference/pom.xml | 4 ++-- .../src/main/resources/jboss/domains/MasterDomain.xml| 2 +- .../src/main/resources/jboss/domains/TwoDomain.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/b8bbd7eb/fit/core-reference/pom.xml -- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 07a1e7a..c720230 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -717,9 +717,9 @@ under the License. true -wildfly9x +wildfly10x - http://download.jboss.org/wildfly/9.0.2.Final/wildfly-9.0.2.Final.zip + http://download.jboss.org/wildfly/10.0.0.Final/wildfly-10.0.0.Final.zip ${settings.localRepository}/org/codehaus/cargo/cargo-container-archives ${project.build.directory}/cargo/extract http://git-wip-us.apache.org/repos/asf/syncope/blob/b8bbd7eb/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml -- diff --git a/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml b/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml index afd18ad..e1393aa 100644 --- a/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml +++ b/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml @@ -116,7 +116,7 @@ under the License. + value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly10x/deployments/syncope.war/WEB-INF/classes, Resources=${Master.orm})"/> http://git-wip-us.apache.org/repos/asf/syncope/blob/b8bbd7eb/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml -- diff --git a/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml b/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml index 6d9d1bb..8243347 100644 --- a/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml +++ b/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml @@ -116,7 +116,7 @@ under the License. + value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly10x/deployments/syncope.war/WEB-INF/classes, Resources=${Two.orm})"/>
syncope git commit: Upgrading swagger-jaxrs
Repository: syncope Updated Branches: refs/heads/master 16a67589e -> 9a10f6e99 Upgrading swagger-jaxrs Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9a10f6e9 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9a10f6e9 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9a10f6e9 Branch: refs/heads/master Commit: 9a10f6e9924bb46c6756fa00433d99f21f3eb982 Parents: 16a6758 Author: Francesco ChicchiriccòAuthored: Wed Mar 16 16:00:14 2016 +0100 Committer: Francesco Chicchiriccò Committed: Wed Mar 16 16:00:14 2016 +0100 -- core/rest-cxf/src/main/resources/restCXFContext.xml| 4 fit/core-reference/src/main/resources/jboss/restCXFContext.xml | 4 pom.xml| 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/9a10f6e9/core/rest-cxf/src/main/resources/restCXFContext.xml -- diff --git a/core/rest-cxf/src/main/resources/restCXFContext.xml b/core/rest-cxf/src/main/resources/restCXFContext.xml index c1cccb0..f7714a1 100644 --- a/core/rest-cxf/src/main/resources/restCXFContext.xml +++ b/core/rest-cxf/src/main/resources/restCXFContext.xml @@ -141,10 +141,6 @@ under the License. - - - - http://git-wip-us.apache.org/repos/asf/syncope/blob/9a10f6e9/fit/core-reference/src/main/resources/jboss/restCXFContext.xml -- diff --git a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml index 38f4d28..a31c10d 100644 --- a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml +++ b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml @@ -150,10 +150,6 @@ under the License. - - - - http://git-wip-us.apache.org/repos/asf/syncope/blob/9a10f6e9/pom.xml -- diff --git a/pom.xml b/pom.xml index 3ca0ed6..8fb974b 100644 --- a/pom.xml +++ b/pom.xml @@ -372,7 +372,7 @@ under the License. ${project.build.directory}/log ${project.build.directory}/activiti-modeler -1.5.7 +1.5.8 2.1.4 2.2.1
syncope git commit: [SYNCOPE-782] Forgot to update the restCXFContext.xml file for Wildlfy, here's why DateParamConverterProvider was not picked up...
Repository: syncope Updated Branches: refs/heads/master 282a19baa -> db624157e [SYNCOPE-782] Forgot to update the restCXFContext.xml file for Wildlfy, here's why DateParamConverterProvider was not picked up... Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/db624157 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/db624157 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/db624157 Branch: refs/heads/master Commit: db624157e24fa58e0c870b8c1fce456e891ad9e7 Parents: 282a19b Author: Francesco ChicchiriccòAuthored: Sat Mar 19 12:07:20 2016 +0100 Committer: Francesco Chicchiriccò Committed: Sat Mar 19 12:07:20 2016 +0100 -- fit/core-reference/src/main/resources/jboss/restCXFContext.xml | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/db624157/fit/core-reference/src/main/resources/jboss/restCXFContext.xml -- diff --git a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml index a31c10d..2417c35 100644 --- a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml +++ b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml @@ -61,6 +61,8 @@ under the License. + + @@ -139,6 +141,7 @@ under the License. +
syncope git commit: Tests alla green with Wildfly 9 - except for SYNCOPE-782
Repository: syncope Updated Branches: refs/heads/master d56a96f3b -> 282a19baa Tests alla green with Wildfly 9 - except for SYNCOPE-782 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/282a19ba Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/282a19ba Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/282a19ba Branch: refs/heads/master Commit: 282a19baac7a21127c6c3c86bed5c8a4e8018aa0 Parents: d56a96f Author: Francesco ChicchiriccòAuthored: Sat Mar 19 11:59:31 2016 +0100 Committer: Francesco Chicchiriccò Committed: Sat Mar 19 11:59:31 2016 +0100 -- fit/core-reference/pom.xml | 34 +- 1 file changed, 33 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/282a19ba/fit/core-reference/pom.xml -- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 924c669..07a1e7a 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -594,10 +594,42 @@ under the License. jboss-it - + javax.xml.ws jaxws-api 2.2.11 + + + org.apache.cxf + cxf-core + ${cxf.version} + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + + + org.apache.cxf + cxf-rt-ws-policy + ${cxf.version} + + + org.apache.cxf + cxf-rt-wsdl + ${cxf.version} + + + + org.apache.syncope.core + syncope-core-persistence-jpa + ${project.version} + + + org.apache.bval + bval-jsr + +
syncope git commit: [SYNCOPE-752] providing console test for users, groups and any objects
Repository: syncope Updated Branches: refs/heads/master 96fd9f55c -> 8287f0621 [SYNCOPE-752] providing console test for users, groups and any objects Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8287f062 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8287f062 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8287f062 Branch: refs/heads/master Commit: 8287f0621eecd53b5d1ef96797c830f0f58876fb Parents: 96fd9f5 Author: fmartelliAuthored: Thu Mar 17 17:47:28 2016 +0100 Committer: fmartelli Committed: Thu Mar 17 17:47:28 2016 +0100 -- .../markup/html/form/ActionLinksPanel.java | 8 +- .../console/wizards/role/RoleWizardBuilder.java | 5 +- .../panels/AbstractSearchResultPanel.properties | 1 + .../AbstractSearchResultPanel_it.properties | 1 + .../AbstractSearchResultPanel_pt_BR.properties | 1 + .../markup/html/form/ActionLinksPanel.html | 6 +- .../syncope/fit/console/AnyObjectsITCase.java | 141 .../syncope/fit/console/GroupsITCase.java | 153 + .../apache/syncope/fit/console/UsersITCase.java | 167 +++ 9 files changed, 474 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/8287f062/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java index 4170ba9..52e1ada 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java @@ -57,7 +57,7 @@ public final class ActionLinksPanel extends Panel { super.add(new Fragment("panelManageGroups", "emptyFragment", this)); super.add(new Fragment("panelMapping", "emptyFragment", this)); super.add(new Fragment("panelAccountLink", "emptyFragment", this)); -super.add(new Fragment("panelResetPwd", "emptyFragment", this)); +super.add(new Fragment("panelMustChangePassword", "emptyFragment", this)); super.add(new Fragment("panelResetTime", "emptyFragment", this)); super.add(new Fragment("panelClone", "emptyFragment", this)); super.add(new Fragment("panelCreate", "emptyFragment", this)); @@ -214,9 +214,9 @@ public final class ActionLinksPanel extends Panel { break; case MUSTCHANGEPASSWORD: -fragment = new Fragment("panelResetPwd", "fragmentResetPwd", this); +fragment = new Fragment("panelMustChangePassword", "fragmentMustChangePassword", this); -fragment.addOrReplace(new IndicatingAjaxLink("resetPwdLink") { +fragment.addOrReplace(new IndicatingAjaxLink("MustChangePasswordLink") { private static final long serialVersionUID = -7978723352517770644L; @@ -813,7 +813,7 @@ public final class ActionLinksPanel extends Panel { break; case MUSTCHANGEPASSWORD: -super.addOrReplace(new Fragment("panelResetPwd", "emptyFragment", this)); +super.addOrReplace(new Fragment("panelMustChangePassword", "emptyFragment", this)); break; case RESET_TIME: http://git-wip-us.apache.org/repos/asf/syncope/blob/8287f062/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java index 4d55084..3450aed 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java @@ -144,7 +144,8 @@ public class RoleWizardBuilder extends AjaxWizardBuilder { modelObject.getEntitlements().clear(); modelObject.getEntitlements().addAll(object); } -}, new ListModel<>(new RoleRestClient().getAllAvailableEntitlements())).setOutputMarkupId(true)); +}, new ListModel<>(new RoleRestClient().getAllAvailableEntitlements())). +
syncope git commit: MySQL and PostgreSQL run all tests green
Repository: syncope Updated Branches: refs/heads/master 2373ccd34 -> c0f3c9933 MySQL and PostgreSQL run all tests green Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c0f3c993 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c0f3c993 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c0f3c993 Branch: refs/heads/master Commit: c0f3c9933ce6ee6be0baddacdbbfd0a631d61e95 Parents: 2373ccd Author: Francesco ChicchiriccòAuthored: Fri Mar 18 10:56:32 2016 +0100 Committer: Francesco Chicchiriccò Committed: Fri Mar 18 14:50:16 2016 +0100 -- .../syncope/client/console/panels/Realm.java| 29 ++- .../client/console/rest/RoleRestClient.java | 5 +++- .../persistence/jpa/dao/JPAVirSchemaDAO.java| 2 +- .../LDAPMembershipPropagationActions.java | 2 +- .../rest/cxf/RestServiceExceptionMapper.java| 7 +++-- .../fit/console/AbstractConsoleITCase.java | 24 +++- .../syncope/fit/console/BulkActionITCase.java | 30 ++-- .../syncope/fit/console/TopologyITCase.java | 18 ++-- .../apache/syncope/fit/core/AnyTypeITCase.java | 6 ++-- .../org/apache/syncope/fit/core/UserITCase.java | 2 +- .../apache/syncope/fit/core/VirAttrITCase.java | 2 ++ 11 files changed, 92 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/c0f3c993/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java index 201e15b..613fab1 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java @@ -20,12 +20,16 @@ package org.apache.syncope.client.console.panels; import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbedPanel; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; +import org.apache.commons.collections4.ComparatorUtils; import org.apache.syncope.client.console.rest.AnyTypeRestClient; import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink; import org.apache.syncope.client.console.wicket.markup.html.form.ActionLinksPanel; import org.apache.syncope.common.lib.to.AnyTypeTO; import org.apache.syncope.common.lib.to.RealmTO; +import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -108,8 +112,8 @@ public abstract class Realm extends Panel { } }); +Collections.sort(anyTypeTOs, new AnyTypeComparator()); for (final AnyTypeTO anyTypeTO : anyTypeTOs) { - tabs.add(new AbstractTab(new Model<>(anyTypeTO.getKey())) { private static final long serialVersionUID = -5861786415855103549L; @@ -128,4 +132,27 @@ public abstract class Realm extends Panel { protected abstract void onClickEdit(final AjaxRequestTarget target, final RealmTO realmTO); protected abstract void onClickDelete(final AjaxRequestTarget target, final RealmTO realmTO); + +private static class AnyTypeComparator implements Comparator { + +@Override +public int compare(final AnyTypeTO o1, final AnyTypeTO o2) { +if (o1.getKind() == AnyTypeKind.USER) { +return -1; +} +if (o2.getKind() == AnyTypeKind.USER) { +return 1; +} + +if (o1.getKind() == AnyTypeKind.GROUP) { +return -1; +} +if (o2.getKind() == AnyTypeKind.GROUP) { +return 1; +} + +return ComparatorUtils.naturalComparator().compare(o1.getKey(), o2.getKey()); +} + +} } http://git-wip-us.apache.org/repos/asf/syncope/blob/c0f3c993/client/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java index d7517ce..116c959 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/RoleRestClient.java @@ -19,6
syncope git commit: Glassfish run all tests green
Repository: syncope Updated Branches: refs/heads/master b5b3b60d1 -> d56a96f3b Glassfish run all tests green Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d56a96f3 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d56a96f3 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d56a96f3 Branch: refs/heads/master Commit: d56a96f3b591d965d866b51750a4468d7a08ee6e Parents: b5b3b60 Author: Francesco ChicchiriccòAuthored: Fri Mar 18 17:49:14 2016 +0100 Committer: Francesco Chicchiriccò Committed: Fri Mar 18 17:49:14 2016 +0100 -- fit/core-reference/pom.xml | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/d56a96f3/fit/core-reference/pom.xml -- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index b7e748d..924c669 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -548,6 +548,18 @@ under the License. + org.apache.syncope.core + syncope-core-persistence-jpa + ${project.version} + + + org.apache.bval + bval-jsr + + + + + com.h2database h2