Repository: syncope Updated Branches: refs/heads/master b96bb5a61 -> 3eb0bfb6c
Upgrading Spring, Wicket and several JS deps Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3eb0bfb6 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3eb0bfb6 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3eb0bfb6 Branch: refs/heads/master Commit: 3eb0bfb6cc6b09a9d09247d8810b83ac6c1e18c5 Parents: b96bb5a Author: Francesco Chicchiriccò <[email protected]> Authored: Sun Jul 5 16:47:06 2015 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Sun Jul 5 16:47:06 2015 +0200 ---------------------------------------------------------------------- .../console/SyncopeConsoleRequestCycleListener.java | 16 +++++----------- .../client/console/pages/ProvisioningModalPage.java | 10 +++++----- pom.xml | 8 ++++---- 3 files changed, 14 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/3eb0bfb6/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java index 925e140..ddccf39 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java @@ -39,39 +39,33 @@ import org.slf4j.LoggerFactory; public class SyncopeConsoleRequestCycleListener extends AbstractRequestCycleListener { - /** - * Logger. - */ private static final Logger LOG = LoggerFactory.getLogger(SyncopeConsoleRequestCycleListener.class); - /** - * {@inheritDoc} - */ @Override public IRequestHandler onException(final RequestCycle cycle, final Exception e) { LOG.error("Exception found", e); PageParameters errorParameters = new PageParameters(); - errorParameters.add("errorTitle", new StringResourceModel("alert", null).getString()); + errorParameters.add("errorTitle", new StringResourceModel("alert").getString()); final Page errorPage; if (e instanceof UnauthorizedInstantiationException) { errorParameters.add("errorMessage", - new StringResourceModel("unauthorizedInstantiationException", null).getString()); + new StringResourceModel("unauthorizedInstantiationException").getString()); errorPage = new ErrorPage(errorParameters); } else if (e.getCause() instanceof AccessControlException) { - errorParameters.add("errorMessage", new StringResourceModel("accessControlException", null).getString()); + errorParameters.add("errorMessage", new StringResourceModel("accessControlException").getString()); errorPage = new ErrorPage(errorParameters); } else if (e instanceof PageExpiredException || !(SyncopeConsoleSession.get()).isSignedIn()) { - errorParameters.add("errorMessage", new StringResourceModel("pageExpiredException", null).getString()); + errorParameters.add("errorMessage", new StringResourceModel("pageExpiredException").getString()); errorPage = new ErrorPage(errorParameters); } else if (e.getCause() instanceof BadRequestException || e.getCause() instanceof WebServiceException || e.getCause() instanceof SyncopeClientException) { - errorParameters.add("errorMessage", new StringResourceModel("restClientException", null).getString()); + errorParameters.add("errorMessage", new StringResourceModel("restClientException").getString()); errorPage = new ErrorPage(errorParameters); } else { http://git-wip-us.apache.org/repos/asf/syncope/blob/3eb0bfb6/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java index 6f56bbb..9937e36 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/ProvisioningModalPage.java @@ -89,19 +89,19 @@ public class ProvisioningModalPage<T extends AnyTO> extends AbstractStatusModalP final List<IColumn<StatusBean, String>> columns = new ArrayList<>(); columns.add(new PropertyColumn<StatusBean, String>( - new StringResourceModel("key", this, null, "Attributable key"), + new StringResourceModel("key", this).setDefaultValue("Attributable key"), "attributableKey", "attributableKey")); columns.add(new PropertyColumn<StatusBean, String>( - new StringResourceModel("name", this, null, "Attributable name"), + new StringResourceModel("name", this).setDefaultValue("Attributable name"), "attributableName", "attributableName")); columns.add(new PropertyColumn<StatusBean, String>( - new StringResourceModel("resourceName", this, null, "Resource name"), + new StringResourceModel("resourceName", this).setDefaultValue("Resource name"), "resourceName", "resourceName")); columns.add(new PropertyColumn<StatusBean, String>( - new StringResourceModel("connObjectLink", this, null, "ConnObjectLink"), + new StringResourceModel("connObjectLink", this).setDefaultValue("ConnObjectLink"), "connObjectLink", "connObjectLink")); columns.add(new AbstractColumn<StatusBean, String>( - new StringResourceModel("status", this, null, "")) { + new StringResourceModel("status", this).setDefaultValue(StringUtils.EMPTY)) { private static final long serialVersionUID = -3503023501954863131L; http://git-wip-us.apache.org/repos/asf/syncope/blob/3eb0bfb6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5ff0eda..cbe9981 100644 --- a/pom.xml +++ b/pom.xml @@ -332,7 +332,7 @@ under the License. <jackson.version>2.5.4</jackson.version> - <spring.version>4.1.6.RELEASE</spring.version> + <spring.version>4.1.7.RELEASE</spring.version> <spring-security.version>4.0.1.RELEASE</spring-security.version> <openjpa.version>2.4.0</openjpa.version> @@ -379,11 +379,11 @@ 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.3</codemirror.version> + <codemirror.version>5.4</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> + <wicket.version>7.0.0-M6</wicket.version> + <wicket-jqueryui.version>7.0.0-M6</wicket-jqueryui.version> <izpack.version>5.0.0-rc5</izpack.version> <httpclient.version>4.3.6</httpclient.version>
