svn commit: r1556832 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/ console/src/main/java/org/apache/syncope/console/pages/

[ilgrosso]

Author: ilgrosso
Date: Thu Jan  9 15:21:55 2014
New Revision: 1556832

URL: http://svn.apache.org/r1556832
Log:
[SYNCOPE-475] Merge from 1_1_X

Modified:
    syncope/trunk/   (props changed)
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ErrorPage.java

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_1_X:r1556807-1556831

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java?rev=1556832&r1=1556831&r2=1556832&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
 Thu Jan  9 15:21:55 2014
@@ -97,10 +97,10 @@ public class SyncopeApplication
         getMarkupSettings().setStripWicketTags(true);
         getMarkupSettings().setCompressWhitespace(true);
 
-        final String activitiModelerDirectory = 
WebApplicationContextUtils.getWebApplicationContext(
-                
WebApplication.get().getServletContext()).getBean("activitiModelerDirectory", 
String.class);
         getRequestCycleListeners().add(new SyncopeRequestCycleListener());
 
+        final String activitiModelerDirectory = 
WebApplicationContextUtils.getWebApplicationContext(
+                
WebApplication.get().getServletContext()).getBean("activitiModelerDirectory", 
String.class);
         mountResource("/" + ACTIVITI_MODELER_CONTEXT, new 
ResourceReference(ACTIVITI_MODELER_CONTEXT) {
 
             private static final long serialVersionUID = -128426276529456602L;

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java?rev=1556832&r1=1556831&r2=1556832&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeRequestCycleListener.java
 Thu Jan  9 15:21:55 2014
@@ -25,7 +25,8 @@ import org.apache.syncope.common.Syncope
 import org.apache.syncope.console.pages.ErrorPage;
 import org.apache.wicket.Page;
 import org.apache.wicket.authorization.UnauthorizedInstantiationException;
-import org.apache.wicket.core.request.handler.ComponentRenderingRequestHandler;
+import org.apache.wicket.core.request.handler.PageProvider;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
 import org.apache.wicket.markup.html.pages.ExceptionErrorPage;
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.protocol.http.PageExpiredException;
@@ -50,10 +51,10 @@ public class SyncopeRequestCycleListener
     public IRequestHandler onException(final RequestCycle cycle, final 
Exception e) {
         LOG.error("Exception found", e);
 
-        final Page errorPage;
         PageParameters errorParameters = new PageParameters();
         errorParameters.add("errorTitle", new StringResourceModel("alert", 
null).getString());
 
+        final Page errorPage;
         if (e instanceof UnauthorizedInstantiationException) {
             errorParameters.add("errorMessage",
                     new 
StringResourceModel("unauthorizedInstantiationException", null).getString());
@@ -78,6 +79,6 @@ public class SyncopeRequestCycleListener
             errorPage = new ExceptionErrorPage(e, null);
         }
 
-        return new ComponentRenderingRequestHandler(errorPage);
+        return new RenderPageRequestHandler(new PageProvider(errorPage));
     }
 }

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ErrorPage.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ErrorPage.java?rev=1556832&r1=1556831&r2=1556832&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ErrorPage.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ErrorPage.java
 Thu Jan  9 15:21:55 2014
@@ -31,7 +31,6 @@ public class ErrorPage extends BasePage 
 
     private static final long serialVersionUID = -390761262038796657L;
 
-    @SuppressWarnings("unchecked")
     public ErrorPage(final PageParameters parameters) {
         super(parameters);