From ae2c302f71554f49b3f57b649cec7450c652cf09 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Mon, 3 Sep 2012 14:03:46 +0300
Subject: Combine ApplicationPortlet and AAP and rename to VaadinPortlet
 (#9460)

---
 WebContent/WEB-INF/portlet.xml                     |    4 +-
 .../vaadin/server/AbstractApplicationPortlet.java  | 1041 -------------------
 .../src/com/vaadin/server/ApplicationPortlet2.java |   50 -
 .../vaadin/server/PortletApplicationContext2.java  |    2 +-
 .../vaadin/server/PortletCommunicationManager.java |   17 +-
 server/src/com/vaadin/server/VaadinPortlet.java    | 1045 ++++++++++++++++++++
 .../com/vaadin/server/WrappedPortletRequest.java   |    2 +-
 .../tests/server/TestClassesSerializable.java      |    3 +-
 8 files changed, 1057 insertions(+), 1107 deletions(-)
 delete mode 100644 server/src/com/vaadin/server/AbstractApplicationPortlet.java
 delete mode 100644 server/src/com/vaadin/server/ApplicationPortlet2.java
 create mode 100644 server/src/com/vaadin/server/VaadinPortlet.java

diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index f695551cf2..5faafc5c36 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -6,7 +6,7 @@
 	<portlet>
 		<portlet-name>JSR286TestPortlet</portlet-name>
 		<display-name>Vaadin Portlet 2.0 Test</display-name>
-		<portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class>
+		<portlet-class>com.vaadin.server.VaadinPortlet</portlet-class>
 		<init-param>
 			<name>application</name>
 			<value>com.vaadin.tests.integration.JSR286PortletApplication</value>
@@ -44,7 +44,7 @@
         <portlet-name>Vaadin Liferay Theme Portlet</portlet-name>
         <display-name>Vaadin Liferay Theme</display-name>
         
-        <portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class>
+        <portlet-class>com.vaadin.server.VaadinPortlet</portlet-class>
         <init-param>
             <name>application</name>
             <value>com.vaadin.tests.integration.LiferayThemeDemo</value>
diff --git a/server/src/com/vaadin/server/AbstractApplicationPortlet.java b/server/src/com/vaadin/server/AbstractApplicationPortlet.java
deleted file mode 100644
index 7fc69b05f7..0000000000
--- a/server/src/com/vaadin/server/AbstractApplicationPortlet.java
+++ /dev/null
@@ -1,1041 +0,0 @@
-/*
- * Copyright 2011 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.server;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.security.GeneralSecurityException;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-
-import com.liferay.portal.kernel.util.PortalClassInvoker;
-import com.liferay.portal.kernel.util.PropsUtil;
-import com.vaadin.Application;
-import com.vaadin.Application.ApplicationStartEvent;
-import com.vaadin.server.AbstractCommunicationManager.Callback;
-import com.vaadin.ui.UI;
-
-/**
- * Portlet 2.0 base class. This replaces the servlet in servlet/portlet 1.0
- * deployments and handles various portlet requests from the browser.
- * 
- * TODO Document me!
- * 
- * @author peholmst
- */
-public abstract class AbstractApplicationPortlet extends GenericPortlet
-        implements Constants {
-
-    public static final String RESOURCE_URL_ID = "APP";
-
-    public static class WrappedHttpAndPortletRequest extends
-            WrappedPortletRequest {
-
-        public WrappedHttpAndPortletRequest(PortletRequest request,
-                HttpServletRequest originalRequest,
-                DeploymentConfiguration deploymentConfiguration) {
-            super(request, deploymentConfiguration);
-            this.originalRequest = originalRequest;
-        }
-
-        private final HttpServletRequest originalRequest;
-
-        @Override
-        public String getParameter(String name) {
-            String parameter = super.getParameter(name);
-            if (parameter == null) {
-                parameter = originalRequest.getParameter(name);
-            }
-            return parameter;
-        }
-
-        @Override
-        public String getRemoteAddr() {
-            return originalRequest.getRemoteAddr();
-        }
-
-        @Override
-        public String getHeader(String name) {
-            String header = super.getHeader(name);
-            if (header == null) {
-                header = originalRequest.getHeader(name);
-            }
-            return header;
-        }
-
-        @Override
-        public Map<String, String[]> getParameterMap() {
-            Map<String, String[]> parameterMap = super.getParameterMap();
-            if (parameterMap == null) {
-                parameterMap = originalRequest.getParameterMap();
-            }
-            return parameterMap;
-        }
-    }
-
-    public static class WrappedGateinRequest extends
-            WrappedHttpAndPortletRequest {
-        public WrappedGateinRequest(PortletRequest request,
-                DeploymentConfiguration deploymentConfiguration) {
-            super(request, getOriginalRequest(request), deploymentConfiguration);
-        }
-
-        private static final HttpServletRequest getOriginalRequest(
-                PortletRequest request) {
-            try {
-                Method getRealReq = request.getClass().getMethod(
-                        "getRealRequest");
-                HttpServletRequestWrapper origRequest = (HttpServletRequestWrapper) getRealReq
-                        .invoke(request);
-                return origRequest;
-            } catch (Exception e) {
-                throw new IllegalStateException("GateIn request not detected",
-                        e);
-            }
-        }
-    }
-
-    public static class WrappedLiferayRequest extends
-            WrappedHttpAndPortletRequest {
-
-        public WrappedLiferayRequest(PortletRequest request,
-                DeploymentConfiguration deploymentConfiguration) {
-            super(request, getOriginalRequest(request), deploymentConfiguration);
-        }
-
-        @Override
-        public String getPortalProperty(String name) {
-            return PropsUtil.get(name);
-        }
-
-        private static HttpServletRequest getOriginalRequest(
-                PortletRequest request) {
-            try {
-                // httpRequest = PortalUtil.getHttpServletRequest(request);
-                HttpServletRequest httpRequest = (HttpServletRequest) PortalClassInvoker
-                        .invoke("com.liferay.portal.util.PortalUtil",
-                                "getHttpServletRequest", request);
-
-                // httpRequest =
-                // PortalUtil.getOriginalServletRequest(httpRequest);
-                httpRequest = (HttpServletRequest) PortalClassInvoker.invoke(
-                        "com.liferay.portal.util.PortalUtil",
-                        "getOriginalServletRequest", httpRequest);
-                return httpRequest;
-            } catch (Exception e) {
-                throw new IllegalStateException("Liferay request not detected",
-                        e);
-            }
-        }
-
-    }
-
-    public static class AbstractApplicationPortletWrapper implements Callback {
-
-        private final AbstractApplicationPortlet portlet;
-
-        public AbstractApplicationPortletWrapper(
-                AbstractApplicationPortlet portlet) {
-            this.portlet = portlet;
-        }
-
-        @Override
-        public void criticalNotification(WrappedRequest request,
-                WrappedResponse response, String cap, String msg,
-                String details, String outOfSyncURL) throws IOException {
-            portlet.criticalNotification(WrappedPortletRequest.cast(request),
-                    (WrappedPortletResponse) response, cap, msg, details,
-                    outOfSyncURL);
-        }
-    }
-
-    /**
-     * This portlet parameter is used to add styles to the main element. E.g
-     * "height:500px" generates a style="height:500px" to the main element.
-     */
-    public static final String PORTLET_PARAMETER_STYLE = "style";
-
-    /**
-     * This portal parameter is used to define the name of the Vaadin theme that
-     * is used for all Vaadin applications in the portal.
-     */
-    public static final String PORTAL_PARAMETER_VAADIN_THEME = "vaadin.theme";
-
-    public static final String WRITE_AJAX_PAGE_SCRIPT_WIDGETSET_SHOULD_WRITE = "writeAjaxPageScriptWidgetsetShouldWrite";
-
-    // TODO some parts could be shared with AbstractApplicationServlet
-
-    // TODO Can we close the application when the portlet is removed? Do we know
-    // when the portlet is removed?
-
-    private DeploymentConfiguration deploymentConfiguration;
-    private AddonContext addonContext;
-
-    @Override
-    public void init(PortletConfig config) throws PortletException {
-        super.init(config);
-        Properties applicationProperties = new Properties();
-
-        // Read default parameters from the context
-        final PortletContext context = config.getPortletContext();
-        for (final Enumeration<String> e = context.getInitParameterNames(); e
-                .hasMoreElements();) {
-            final String name = e.nextElement();
-            applicationProperties.setProperty(name,
-                    context.getInitParameter(name));
-        }
-
-        // Override with application settings from portlet.xml
-        for (final Enumeration<String> e = config.getInitParameterNames(); e
-                .hasMoreElements();) {
-            final String name = e.nextElement();
-            applicationProperties.setProperty(name,
-                    config.getInitParameter(name));
-        }
-
-        deploymentConfiguration = new AbstractDeploymentConfiguration(
-                getClass(), applicationProperties) {
-            @Override
-            public String getConfiguredWidgetset(WrappedRequest request) {
-
-                String widgetset = getApplicationOrSystemProperty(
-                        PARAMETER_WIDGETSET, null);
-
-                if (widgetset == null) {
-                    // If no widgetset defined for the application, check the
-                    // portal property
-                    widgetset = WrappedPortletRequest.cast(request)
-                            .getPortalProperty(
-                                    PORTAL_PARAMETER_VAADIN_WIDGETSET);
-                }
-
-                if (widgetset == null) {
-                    // If no widgetset defined for the portal, use the default
-                    widgetset = DEFAULT_WIDGETSET;
-                }
-
-                return widgetset;
-            }
-
-            @Override
-            public String getConfiguredTheme(WrappedRequest request) {
-
-                // is the default theme defined by the portal?
-                String themeName = WrappedPortletRequest.cast(request)
-                        .getPortalProperty(
-                                Constants.PORTAL_PARAMETER_VAADIN_THEME);
-
-                if (themeName == null) {
-                    // no, using the default theme defined by Vaadin
-                    themeName = DEFAULT_THEME_NAME;
-                }
-
-                return themeName;
-            }
-
-            @Override
-            public boolean isStandalone(WrappedRequest request) {
-                return false;
-            }
-
-            /*
-             * (non-Javadoc)
-             * 
-             * @see
-             * com.vaadin.terminal.DeploymentConfiguration#getStaticFileLocation
-             * (com.vaadin.terminal.WrappedRequest)
-             * 
-             * Return the URL from where static files, e.g. the widgetset and
-             * the theme, are served. In a standard configuration the VAADIN
-             * folder inside the returned folder is what is used for widgetsets
-             * and themes.
-             * 
-             * @return The location of static resources (inside which there
-             * should be a VAADIN directory). Does not end with a slash (/).
-             */
-
-            @Override
-            public String getStaticFileLocation(WrappedRequest request) {
-                String staticFileLocation = WrappedPortletRequest
-                        .cast(request)
-                        .getPortalProperty(
-                                Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH);
-                if (staticFileLocation != null) {
-                    // remove trailing slash if any
-                    while (staticFileLocation.endsWith(".")) {
-                        staticFileLocation = staticFileLocation.substring(0,
-                                staticFileLocation.length() - 1);
-                    }
-                    return staticFileLocation;
-                } else {
-                    // default for Liferay
-                    return "/html";
-                }
-            }
-
-            @Override
-            public String getMimeType(String resourceName) {
-                return getPortletContext().getMimeType(resourceName);
-            }
-
-            @Override
-            public SystemMessages getSystemMessages() {
-                return AbstractApplicationPortlet.this.getSystemMessages();
-            }
-        };
-
-        addonContext = new AddonContext(deploymentConfiguration);
-        addonContext.init();
-    }
-
-    @Override
-    public void destroy() {
-        super.destroy();
-
-        addonContext.destroy();
-    }
-
-    protected enum RequestType {
-        FILE_UPLOAD, UIDL, RENDER, STATIC_FILE, APPLICATION_RESOURCE, DUMMY, EVENT, ACTION, UNKNOWN, BROWSER_DETAILS, CONNECTOR_RESOURCE, HEARTBEAT;
-    }
-
-    protected RequestType getRequestType(WrappedPortletRequest wrappedRequest) {
-        PortletRequest request = wrappedRequest.getPortletRequest();
-        if (request instanceof RenderRequest) {
-            return RequestType.RENDER;
-        } else if (request instanceof ResourceRequest) {
-            ResourceRequest resourceRequest = (ResourceRequest) request;
-            if (ServletPortletHelper.isUIDLRequest(wrappedRequest)) {
-                return RequestType.UIDL;
-            } else if (isBrowserDetailsRequest(resourceRequest)) {
-                return RequestType.BROWSER_DETAILS;
-            } else if (ServletPortletHelper.isFileUploadRequest(wrappedRequest)) {
-                return RequestType.FILE_UPLOAD;
-            } else if (ServletPortletHelper
-                    .isConnectorResourceRequest(wrappedRequest)) {
-                return RequestType.CONNECTOR_RESOURCE;
-            } else if (ServletPortletHelper
-                    .isApplicationResourceRequest(wrappedRequest)) {
-                return RequestType.APPLICATION_RESOURCE;
-            } else if (ServletPortletHelper.isHeartbeatRequest(wrappedRequest)) {
-                return RequestType.HEARTBEAT;
-            } else if (isDummyRequest(resourceRequest)) {
-                return RequestType.DUMMY;
-            } else {
-                return RequestType.STATIC_FILE;
-            }
-        } else if (request instanceof ActionRequest) {
-            return RequestType.ACTION;
-        } else if (request instanceof EventRequest) {
-            return RequestType.EVENT;
-        }
-        return RequestType.UNKNOWN;
-    }
-
-    private boolean isBrowserDetailsRequest(ResourceRequest request) {
-        return request.getResourceID() != null
-                && request.getResourceID().equals("browserDetails");
-    }
-
-    private boolean isDummyRequest(ResourceRequest request) {
-        return request.getResourceID() != null
-                && request.getResourceID().equals("DUMMY");
-    }
-
-    /**
-     * Returns true if the portlet is running in production mode. Production
-     * mode disables all debug facilities.
-     * 
-     * @return true if in production mode, false if in debug mode
-     */
-    public boolean isProductionMode() {
-        return deploymentConfiguration.isProductionMode();
-    }
-
-    protected void handleRequest(PortletRequest request,
-            PortletResponse response) throws PortletException, IOException {
-        RequestTimer requestTimer = new RequestTimer();
-        requestTimer.start();
-
-        AbstractApplicationPortletWrapper portletWrapper = new AbstractApplicationPortletWrapper(
-                this);
-
-        WrappedPortletRequest wrappedRequest = createWrappedRequest(request);
-
-        WrappedPortletResponse wrappedResponse = new WrappedPortletResponse(
-                response, getDeploymentConfiguration());
-
-        RequestType requestType = getRequestType(wrappedRequest);
-
-        if (requestType == RequestType.UNKNOWN) {
-            handleUnknownRequest(request, response);
-        } else if (requestType == RequestType.DUMMY) {
-            /*
-             * This dummy page is used by action responses to redirect to, in
-             * order to prevent the boot strap code from being rendered into
-             * strange places such as iframes.
-             */
-            ((ResourceResponse) response).setContentType("text/html");
-            final OutputStream out = ((ResourceResponse) response)
-                    .getPortletOutputStream();
-            final PrintWriter outWriter = new PrintWriter(new BufferedWriter(
-                    new OutputStreamWriter(out, "UTF-8")));
-            outWriter.print("<html><body>dummy page</body></html>");
-            outWriter.close();
-        } else if (requestType == RequestType.STATIC_FILE) {
-            serveStaticResources((ResourceRequest) request,
-                    (ResourceResponse) response);
-        } else {
-            Application application = null;
-            boolean transactionStarted = false;
-            boolean requestStarted = false;
-            boolean applicationRunning = false;
-
-            try {
-                // TODO What about PARAM_UNLOADBURST & redirectToApplication??
-
-                /* Find out which application this request is related to */
-                application = findApplicationInstance(wrappedRequest,
-                        requestType);
-                if (application == null) {
-                    return;
-                }
-                Application.setCurrent(application);
-
-                /*
-                 * Get or create an application context and an application
-                 * manager for the session
-                 */
-                PortletApplicationContext2 applicationContext = getApplicationContext(request
-                        .getPortletSession());
-                applicationContext.setResponse(response);
-                applicationContext.setPortletConfig(getPortletConfig());
-
-                PortletCommunicationManager applicationManager = applicationContext
-                        .getApplicationManager(application);
-
-                if (requestType == RequestType.CONNECTOR_RESOURCE) {
-                    applicationManager.serveConnectorResource(wrappedRequest,
-                            wrappedResponse);
-                    return;
-                } else if (requestType == RequestType.HEARTBEAT) {
-                    applicationManager.handleHeartbeatRequest(wrappedRequest,
-                            wrappedResponse, application);
-                    return;
-                }
-
-                /* Update browser information from request */
-                applicationContext.getBrowser().updateRequestDetails(
-                        wrappedRequest);
-
-                /*
-                 * Call application requestStart before Application.init() is
-                 * called (bypasses the limitation in TransactionListener)
-                 */
-                if (application instanceof PortletRequestListener) {
-                    ((PortletRequestListener) application).onRequestStart(
-                            request, response);
-                    requestStarted = true;
-                }
-
-                /* Start the newly created application */
-                startApplication(request, application, applicationContext);
-                applicationRunning = true;
-
-                /*
-                 * Transaction starts. Call transaction listeners. Transaction
-                 * end is called in the finally block below.
-                 */
-                applicationContext.startTransaction(application, request);
-                transactionStarted = true;
-
-                /* Notify listeners */
-
-                // Finds the window within the application
-                UI uI = null;
-                synchronized (application) {
-                    if (application.isRunning()) {
-                        switch (requestType) {
-                        case RENDER:
-                        case ACTION:
-                            // Both action requests and render requests are ok
-                            // without a UI as they render the initial HTML
-                            // and then do a second request
-                            uI = application.getUIForRequest(wrappedRequest);
-                            break;
-                        case BROWSER_DETAILS:
-                            // Should not try to find a UI here as the
-                            // combined request details might change the UI
-                            break;
-                        case FILE_UPLOAD:
-                            // no window
-                            break;
-                        case APPLICATION_RESOURCE:
-                            // use main window - should not need any window
-                            // UI = application.getUI();
-                            break;
-                        default:
-                            uI = application.getUIForRequest(wrappedRequest);
-                        }
-                        // if window not found, not a problem - use null
-                    }
-                }
-
-                // TODO Should this happen before or after the transaction
-                // starts?
-                if (request instanceof RenderRequest) {
-                    applicationContext.firePortletRenderRequest(application,
-                            uI, (RenderRequest) request,
-                            (RenderResponse) response);
-                } else if (request instanceof ActionRequest) {
-                    applicationContext.firePortletActionRequest(application,
-                            uI, (ActionRequest) request,
-                            (ActionResponse) response);
-                } else if (request instanceof EventRequest) {
-                    applicationContext.firePortletEventRequest(application, uI,
-                            (EventRequest) request, (EventResponse) response);
-                } else if (request instanceof ResourceRequest) {
-                    applicationContext.firePortletResourceRequest(application,
-                            uI, (ResourceRequest) request,
-                            (ResourceResponse) response);
-                }
-
-                /* Handle the request */
-                if (requestType == RequestType.FILE_UPLOAD) {
-                    // UI is resolved in handleFileUpload by
-                    // PortletCommunicationManager
-                    applicationManager.handleFileUpload(application,
-                            wrappedRequest, wrappedResponse);
-                    return;
-                } else if (requestType == RequestType.BROWSER_DETAILS) {
-                    applicationManager.handleBrowserDetailsRequest(
-                            wrappedRequest, wrappedResponse, application);
-                    return;
-                } else if (requestType == RequestType.UIDL) {
-                    // Handles AJAX UIDL requests
-                    applicationManager.handleUidlRequest(wrappedRequest,
-                            wrappedResponse, portletWrapper, uI);
-                    return;
-                } else {
-                    /*
-                     * Removes the application if it has stopped
-                     */
-                    if (!application.isRunning()) {
-                        endApplication(request, response, application);
-                        return;
-                    }
-
-                    handleOtherRequest(wrappedRequest, wrappedResponse,
-                            requestType, application, applicationContext,
-                            applicationManager);
-                }
-            } catch (final SessionExpiredException e) {
-                // TODO Figure out a better way to deal with
-                // SessionExpiredExceptions
-                getLogger().finest("A user session has expired");
-            } catch (final GeneralSecurityException e) {
-                // TODO Figure out a better way to deal with
-                // GeneralSecurityExceptions
-                getLogger()
-                        .fine("General security exception, the security key was probably incorrect.");
-            } catch (final Throwable e) {
-                handleServiceException(wrappedRequest, wrappedResponse,
-                        application, e);
-            } finally {
-
-                if (applicationRunning) {
-                    application.closeInactiveUIs();
-                }
-
-                // Notifies transaction end
-                try {
-                    if (transactionStarted) {
-                        ((PortletApplicationContext2) application.getContext())
-                                .endTransaction(application, request);
-                    }
-                } finally {
-                    try {
-                        if (requestStarted) {
-                            ((PortletRequestListener) application)
-                                    .onRequestEnd(request, response);
-
-                        }
-                    } finally {
-                        UI.setCurrent(null);
-                        Application.setCurrent(null);
-
-                        PortletSession session = request
-                                .getPortletSession(false);
-                        if (session != null) {
-                            requestTimer.stop(getApplicationContext(session));
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Wraps the request in a (possibly portal specific) wrapped portlet
-     * request.
-     * 
-     * @param request
-     *            The original PortletRequest
-     * @return A wrapped version of the PorletRequest
-     */
-    protected WrappedPortletRequest createWrappedRequest(PortletRequest request) {
-        String portalInfo = request.getPortalContext().getPortalInfo()
-                .toLowerCase();
-        if (portalInfo.contains("liferay")) {
-            return new WrappedLiferayRequest(request,
-                    getDeploymentConfiguration());
-        } else if (portalInfo.contains("gatein")) {
-            return new WrappedGateinRequest(request,
-                    getDeploymentConfiguration());
-        } else {
-            return new WrappedPortletRequest(request,
-                    getDeploymentConfiguration());
-        }
-
-    }
-
-    protected DeploymentConfiguration getDeploymentConfiguration() {
-        return deploymentConfiguration;
-    }
-
-    private void handleUnknownRequest(PortletRequest request,
-            PortletResponse response) {
-        getLogger().warning("Unknown request type");
-    }
-
-    /**
-     * Handle a portlet request that is not for static files, UIDL or upload.
-     * Also render requests are handled here.
-     * 
-     * This method is called after starting the application and calling portlet
-     * and transaction listeners.
-     * 
-     * @param request
-     * @param response
-     * @param requestType
-     * @param application
-     * @param applicationContext
-     * @param applicationManager
-     * @throws PortletException
-     * @throws IOException
-     * @throws MalformedURLException
-     */
-    private void handleOtherRequest(WrappedPortletRequest request,
-            WrappedResponse response, RequestType requestType,
-            Application application,
-            PortletApplicationContext2 applicationContext,
-            PortletCommunicationManager applicationManager)
-            throws PortletException, IOException, MalformedURLException {
-        if (requestType == RequestType.APPLICATION_RESOURCE
-                || requestType == RequestType.RENDER) {
-            if (!applicationManager.handleApplicationRequest(request, response)) {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND,
-                        "Not found");
-            }
-        } else if (requestType == RequestType.EVENT) {
-            // nothing to do, listeners do all the work
-        } else if (requestType == RequestType.ACTION) {
-            // nothing to do, listeners do all the work
-        } else {
-            throw new IllegalStateException(
-                    "handleRequest() without anything to do - should never happen!");
-        }
-    }
-
-    @Override
-    public void processEvent(EventRequest request, EventResponse response)
-            throws PortletException, IOException {
-        handleRequest(request, response);
-    }
-
-    private void serveStaticResources(ResourceRequest request,
-            ResourceResponse response) throws IOException, PortletException {
-        final String resourceID = request.getResourceID();
-        final PortletContext pc = getPortletContext();
-
-        InputStream is = pc.getResourceAsStream(resourceID);
-        if (is != null) {
-            final String mimetype = pc.getMimeType(resourceID);
-            if (mimetype != null) {
-                response.setContentType(mimetype);
-            }
-            final OutputStream os = response.getPortletOutputStream();
-            final byte buffer[] = new byte[DEFAULT_BUFFER_SIZE];
-            int bytes;
-            while ((bytes = is.read(buffer)) >= 0) {
-                os.write(buffer, 0, bytes);
-            }
-        } else {
-            getLogger().info(
-                    "Requested resource [" + resourceID
-                            + "] could not be found");
-            response.setProperty(ResourceResponse.HTTP_STATUS_CODE,
-                    Integer.toString(HttpServletResponse.SC_NOT_FOUND));
-        }
-    }
-
-    @Override
-    public void processAction(ActionRequest request, ActionResponse response)
-            throws PortletException, IOException {
-        handleRequest(request, response);
-    }
-
-    @Override
-    protected void doDispatch(RenderRequest request, RenderResponse response)
-            throws PortletException, IOException {
-        try {
-            // try to let super handle - it'll call methods annotated for
-            // handling, the default doXYZ(), or throw if a handler for the mode
-            // is not found
-            super.doDispatch(request, response);
-
-        } catch (PortletException e) {
-            if (e.getCause() == null) {
-                // No cause interpreted as 'unknown mode' - pass that trough
-                // so that the application can handle
-                handleRequest(request, response);
-
-            } else {
-                // Something else failed, pass on
-                throw e;
-            }
-        }
-    }
-
-    @Override
-    public void serveResource(ResourceRequest request, ResourceResponse response)
-            throws PortletException, IOException {
-        handleRequest(request, response);
-    }
-
-    boolean requestCanCreateApplication(PortletRequest request,
-            RequestType requestType) {
-        if (requestType == RequestType.UIDL && isRepaintAll(request)) {
-            return true;
-        } else if (requestType == RequestType.RENDER) {
-            // In most cases the first request is a render request that renders
-            // the HTML fragment. This should create an application instance.
-            return true;
-        } else if (requestType == RequestType.EVENT) {
-            // A portlet can also be sent an event even though it has not been
-            // rendered, e.g. portlet on one page sends an event to a portlet on
-            // another page and then moves the user to that page.
-            return true;
-        }
-        return false;
-    }
-
-    private boolean isRepaintAll(PortletRequest request) {
-        return (request.getParameter(URL_PARAMETER_REPAINT_ALL) != null)
-                && (request.getParameter(URL_PARAMETER_REPAINT_ALL).equals("1"));
-    }
-
-    private void startApplication(PortletRequest request,
-            Application application, PortletApplicationContext2 context)
-            throws PortletException, MalformedURLException {
-        if (!application.isRunning()) {
-            Locale locale = request.getLocale();
-            application.setLocale(locale);
-            // No application URL when running inside a portlet
-            application.start(new ApplicationStartEvent(null,
-                    getDeploymentConfiguration(), context));
-            addonContext.fireApplicationStarted(application);
-        }
-    }
-
-    private void endApplication(PortletRequest request,
-            PortletResponse response, Application application)
-            throws IOException {
-        final PortletSession session = request.getPortletSession();
-        if (session != null) {
-            getApplicationContext(session).removeApplication(application);
-        }
-        // Do not send any redirects when running inside a portlet.
-    }
-
-    private Application findApplicationInstance(
-            WrappedPortletRequest wrappedRequest, RequestType requestType)
-            throws PortletException, SessionExpiredException,
-            MalformedURLException {
-        PortletRequest request = wrappedRequest.getPortletRequest();
-
-        boolean requestCanCreateApplication = requestCanCreateApplication(
-                request, requestType);
-
-        /* Find an existing application for this request. */
-        Application application = getExistingApplication(request,
-                requestCanCreateApplication);
-
-        if (application != null) {
-            /*
-             * There is an existing application. We can use this as long as the
-             * user not specifically requested to close or restart it.
-             */
-
-            final boolean restartApplication = (wrappedRequest
-                    .getParameter(URL_PARAMETER_RESTART_APPLICATION) != null);
-            final boolean closeApplication = (wrappedRequest
-                    .getParameter(URL_PARAMETER_CLOSE_APPLICATION) != null);
-
-            if (restartApplication) {
-                closeApplication(application, request.getPortletSession(false));
-                return createApplication(request);
-            } else if (closeApplication) {
-                closeApplication(application, request.getPortletSession(false));
-                return null;
-            } else {
-                return application;
-            }
-        }
-
-        // No existing application was found
-
-        if (requestCanCreateApplication) {
-            return createApplication(request);
-        } else {
-            throw new SessionExpiredException();
-        }
-    }
-
-    private void closeApplication(Application application,
-            PortletSession session) {
-        if (application == null) {
-            return;
-        }
-
-        application.close();
-        if (session != null) {
-            PortletApplicationContext2 context = getApplicationContext(session);
-            context.removeApplication(application);
-        }
-    }
-
-    private Application createApplication(PortletRequest request)
-            throws PortletException, MalformedURLException {
-        Application newApplication = getNewApplication(request);
-        final PortletApplicationContext2 context = getApplicationContext(request
-                .getPortletSession());
-        context.addApplication(newApplication, request.getWindowID());
-        return newApplication;
-    }
-
-    private Application getExistingApplication(PortletRequest request,
-            boolean allowSessionCreation) throws MalformedURLException,
-            SessionExpiredException {
-
-        final PortletSession session = request
-                .getPortletSession(allowSessionCreation);
-
-        if (session == null) {
-            throw new SessionExpiredException();
-        }
-
-        PortletApplicationContext2 context = getApplicationContext(session);
-        Application application = context.getApplicationForWindowId(request
-                .getWindowID());
-        if (application == null) {
-            return null;
-        }
-        if (application.isRunning()) {
-            return application;
-        }
-        // application found but not running
-        context.removeApplication(application);
-
-        return null;
-    }
-
-    protected abstract Class<? extends Application> getApplicationClass()
-            throws ClassNotFoundException;
-
-    protected Application getNewApplication(PortletRequest request)
-            throws PortletException {
-        try {
-            final Application application = getApplicationClass().newInstance();
-            return application;
-        } catch (final IllegalAccessException e) {
-            throw new PortletException("getNewApplication failed", e);
-        } catch (final InstantiationException e) {
-            throw new PortletException("getNewApplication failed", e);
-        } catch (final ClassNotFoundException e) {
-            throw new PortletException("getNewApplication failed", e);
-        }
-    }
-
-    /**
-     * Get system messages from the current application class
-     * 
-     * @return
-     */
-    protected SystemMessages getSystemMessages() {
-        return ServletPortletHelper.DEFAULT_SYSTEM_MESSAGES;
-    }
-
-    private void handleServiceException(WrappedPortletRequest request,
-            WrappedPortletResponse response, Application application,
-            Throwable e) throws IOException, PortletException {
-        // TODO Check that this error handler is working when running inside a
-        // portlet
-
-        // if this was an UIDL request, response UIDL back to client
-        if (getRequestType(request) == RequestType.UIDL) {
-            SystemMessages ci = getSystemMessages();
-            criticalNotification(request, response,
-                    ci.getInternalErrorCaption(), ci.getInternalErrorMessage(),
-                    null, ci.getInternalErrorURL());
-            if (application != null) {
-                application.getErrorHandler()
-                        .terminalError(new RequestError(e));
-            } else {
-                throw new PortletException(e);
-            }
-        } else {
-            // Re-throw other exceptions
-            throw new PortletException(e);
-        }
-
-    }
-
-    @SuppressWarnings("serial")
-    public class RequestError implements Terminal.ErrorEvent, Serializable {
-
-        private final Throwable throwable;
-
-        public RequestError(Throwable throwable) {
-            this.throwable = throwable;
-        }
-
-        @Override
-        public Throwable getThrowable() {
-            return throwable;
-        }
-
-    }
-
-    /**
-     * Send notification to client's application. Used to notify client of
-     * critical errors and session expiration due to long inactivity. Server has
-     * no knowledge of what application client refers to.
-     * 
-     * @param request
-     *            the Portlet request instance.
-     * @param response
-     *            the Portlet response to write to.
-     * @param caption
-     *            for the notification
-     * @param message
-     *            for the notification
-     * @param details
-     *            a detail message to show in addition to the passed message.
-     *            Currently shown directly but could be hidden behind a details
-     *            drop down.
-     * @param url
-     *            url to load after message, null for current page
-     * @throws IOException
-     *             if the writing failed due to input/output error.
-     */
-    void criticalNotification(WrappedPortletRequest request,
-            WrappedPortletResponse response, String caption, String message,
-            String details, String url) throws IOException {
-
-        // clients JS app is still running, but server application either
-        // no longer exists or it might fail to perform reasonably.
-        // send a notification to client's application and link how
-        // to "restart" application.
-
-        if (caption != null) {
-            caption = "\"" + caption + "\"";
-        }
-        if (details != null) {
-            if (message == null) {
-                message = details;
-            } else {
-                message += "<br/><br/>" + details;
-            }
-        }
-        if (message != null) {
-            message = "\"" + message + "\"";
-        }
-        if (url != null) {
-            url = "\"" + url + "\"";
-        }
-
-        // Set the response type
-        response.setContentType("application/json; charset=UTF-8");
-        final OutputStream out = response.getOutputStream();
-        final PrintWriter outWriter = new PrintWriter(new BufferedWriter(
-                new OutputStreamWriter(out, "UTF-8")));
-        outWriter.print("for(;;);[{\"changes\":[], \"meta\" : {"
-                + "\"appError\": {" + "\"caption\":" + caption + ","
-                + "\"message\" : " + message + "," + "\"url\" : " + url
-                + "}}, \"resources\": {}, \"locales\":[]}]");
-        outWriter.close();
-    }
-
-    /**
-     * 
-     * Gets the application context for a PortletSession. If no context is
-     * currently stored in a session a new context is created and stored in the
-     * session.
-     * 
-     * @param portletSession
-     *            the portlet session.
-     * @return the application context for the session.
-     */
-    protected PortletApplicationContext2 getApplicationContext(
-            PortletSession portletSession) {
-        return PortletApplicationContext2.getApplicationContext(portletSession);
-    }
-
-    private static final Logger getLogger() {
-        return Logger.getLogger(AbstractApplicationPortlet.class.getName());
-    }
-
-}
diff --git a/server/src/com/vaadin/server/ApplicationPortlet2.java b/server/src/com/vaadin/server/ApplicationPortlet2.java
deleted file mode 100644
index 3708d8fe0d..0000000000
--- a/server/src/com/vaadin/server/ApplicationPortlet2.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* 
- * Copyright 2011 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.server;
-
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-
-import com.vaadin.Application;
-import com.vaadin.server.ServletPortletHelper.ApplicationClassException;
-
-/**
- * TODO Write documentation, fix JavaDoc tags.
- * 
- * @author peholmst
- */
-public class ApplicationPortlet2 extends AbstractApplicationPortlet {
-
-    private Class<? extends Application> applicationClass;
-
-    @Override
-    public void init(PortletConfig config) throws PortletException {
-        super.init(config);
-        try {
-            applicationClass = ServletPortletHelper
-                    .getApplicationClass(getDeploymentConfiguration());
-        } catch (ApplicationClassException e) {
-            throw new PortletException(e);
-        }
-    }
-
-    @Override
-    protected Class<? extends Application> getApplicationClass() {
-        return applicationClass;
-    }
-
-}
diff --git a/server/src/com/vaadin/server/PortletApplicationContext2.java b/server/src/com/vaadin/server/PortletApplicationContext2.java
index 366c5b160d..cea97bc939 100644
--- a/server/src/com/vaadin/server/PortletApplicationContext2.java
+++ b/server/src/com/vaadin/server/PortletApplicationContext2.java
@@ -254,7 +254,7 @@ public class PortletApplicationContext2 extends ApplicationContext {
     }
 
     /**
-     * This is for use by {@link AbstractApplicationPortlet} only.
+     * This is for use by {@link VaadinPortlet} only.
      * 
      * TODO cleaner implementation, now "semi-static"!
      * 
diff --git a/server/src/com/vaadin/server/PortletCommunicationManager.java b/server/src/com/vaadin/server/PortletCommunicationManager.java
index 697095d691..cb3a8eab80 100644
--- a/server/src/com/vaadin/server/PortletCommunicationManager.java
+++ b/server/src/com/vaadin/server/PortletCommunicationManager.java
@@ -97,8 +97,7 @@ public class PortletCommunicationManager extends AbstractCommunicationManager {
 
                 ResourceURL portletResourceUrl = getRenderResponse(context)
                         .createResourceURL();
-                portletResourceUrl
-                        .setResourceID(AbstractApplicationPortlet.RESOURCE_URL_ID);
+                portletResourceUrl.setResourceID(VaadinPortlet.RESOURCE_URL_ID);
                 defaults.put(ApplicationConstants.PORTLET_RESOUCE_URL_BASE,
                         portletResourceUrl.toString());
 
@@ -113,10 +112,9 @@ public class PortletCommunicationManager extends AbstractCommunicationManager {
                     throws JSONException, IOException {
                 // fixed base theme to use - all portal pages with Vaadin
                 // applications will load this exactly once
-                String portalTheme = WrappedPortletRequest
-                        .cast(context.getRequest())
-                        .getPortalProperty(
-                                AbstractApplicationPortlet.PORTAL_PARAMETER_VAADIN_THEME);
+                String portalTheme = WrappedPortletRequest.cast(
+                        context.getRequest()).getPortalProperty(
+                        VaadinPortlet.PORTAL_PARAMETER_VAADIN_THEME);
                 if (portalTheme != null
                         && !portalTheme.equals(context.getThemeName())) {
                     String portalThemeUri = getThemeUri(context, portalTheme);
@@ -133,8 +131,7 @@ public class PortletCommunicationManager extends AbstractCommunicationManager {
                 DeploymentConfiguration deploymentConfiguration = context
                         .getRequest().getDeploymentConfiguration();
                 return deploymentConfiguration.getApplicationOrSystemProperty(
-                        AbstractApplicationPortlet.PORTLET_PARAMETER_STYLE,
-                        null);
+                        VaadinPortlet.PORTLET_PARAMETER_STYLE, null);
             }
 
             @Override
@@ -164,8 +161,8 @@ public class PortletCommunicationManager extends AbstractCommunicationManager {
         PortletContext portletContext = context.getPortletSession()
                 .getPortletContext();
         return portletContext.getResourceAsStream("/"
-                + AbstractApplicationPortlet.THEME_DIRECTORY_PATH + themeName
-                + "/" + resource);
+                + VaadinPortlet.THEME_DIRECTORY_PATH + themeName + "/"
+                + resource);
     }
 
 }
diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
new file mode 100644
index 0000000000..25512e9237
--- /dev/null
+++ b/server/src/com/vaadin/server/VaadinPortlet.java
@@ -0,0 +1,1045 @@
+/*
+ * Copyright 2011 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.server;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.security.GeneralSecurityException;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.logging.Logger;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+
+import com.liferay.portal.kernel.util.PortalClassInvoker;
+import com.liferay.portal.kernel.util.PropsUtil;
+import com.vaadin.Application;
+import com.vaadin.Application.ApplicationStartEvent;
+import com.vaadin.server.AbstractCommunicationManager.Callback;
+import com.vaadin.server.ServletPortletHelper.ApplicationClassException;
+import com.vaadin.ui.UI;
+
+/**
+ * Portlet 2.0 base class. This replaces the servlet in servlet/portlet 1.0
+ * deployments and handles various portlet requests from the browser.
+ * 
+ * TODO Document me!
+ * 
+ * @author peholmst
+ */
+public class VaadinPortlet extends GenericPortlet implements
+        Constants {
+
+    public static final String RESOURCE_URL_ID = "APP";
+
+    public static class WrappedHttpAndPortletRequest extends
+            WrappedPortletRequest {
+
+        public WrappedHttpAndPortletRequest(PortletRequest request,
+                HttpServletRequest originalRequest,
+                DeploymentConfiguration deploymentConfiguration) {
+            super(request, deploymentConfiguration);
+            this.originalRequest = originalRequest;
+        }
+
+        private final HttpServletRequest originalRequest;
+
+        @Override
+        public String getParameter(String name) {
+            String parameter = super.getParameter(name);
+            if (parameter == null) {
+                parameter = originalRequest.getParameter(name);
+            }
+            return parameter;
+        }
+
+        @Override
+        public String getRemoteAddr() {
+            return originalRequest.getRemoteAddr();
+        }
+
+        @Override
+        public String getHeader(String name) {
+            String header = super.getHeader(name);
+            if (header == null) {
+                header = originalRequest.getHeader(name);
+            }
+            return header;
+        }
+
+        @Override
+        public Map<String, String[]> getParameterMap() {
+            Map<String, String[]> parameterMap = super.getParameterMap();
+            if (parameterMap == null) {
+                parameterMap = originalRequest.getParameterMap();
+            }
+            return parameterMap;
+        }
+    }
+
+    public static class WrappedGateinRequest extends
+            WrappedHttpAndPortletRequest {
+        public WrappedGateinRequest(PortletRequest request,
+                DeploymentConfiguration deploymentConfiguration) {
+            super(request, getOriginalRequest(request), deploymentConfiguration);
+        }
+
+        private static final HttpServletRequest getOriginalRequest(
+                PortletRequest request) {
+            try {
+                Method getRealReq = request.getClass().getMethod(
+                        "getRealRequest");
+                HttpServletRequestWrapper origRequest = (HttpServletRequestWrapper) getRealReq
+                        .invoke(request);
+                return origRequest;
+            } catch (Exception e) {
+                throw new IllegalStateException("GateIn request not detected",
+                        e);
+            }
+        }
+    }
+
+    public static class WrappedLiferayRequest extends
+            WrappedHttpAndPortletRequest {
+
+        public WrappedLiferayRequest(PortletRequest request,
+                DeploymentConfiguration deploymentConfiguration) {
+            super(request, getOriginalRequest(request), deploymentConfiguration);
+        }
+
+        @Override
+        public String getPortalProperty(String name) {
+            return PropsUtil.get(name);
+        }
+
+        private static HttpServletRequest getOriginalRequest(
+                PortletRequest request) {
+            try {
+                // httpRequest = PortalUtil.getHttpServletRequest(request);
+                HttpServletRequest httpRequest = (HttpServletRequest) PortalClassInvoker
+                        .invoke("com.liferay.portal.util.PortalUtil",
+                                "getHttpServletRequest", request);
+
+                // httpRequest =
+                // PortalUtil.getOriginalServletRequest(httpRequest);
+                httpRequest = (HttpServletRequest) PortalClassInvoker.invoke(
+                        "com.liferay.portal.util.PortalUtil",
+                        "getOriginalServletRequest", httpRequest);
+                return httpRequest;
+            } catch (Exception e) {
+                throw new IllegalStateException("Liferay request not detected",
+                        e);
+            }
+        }
+
+    }
+
+    public static class AbstractApplicationPortletWrapper implements Callback {
+
+        private final VaadinPortlet portlet;
+
+        public AbstractApplicationPortletWrapper(
+                VaadinPortlet portlet) {
+            this.portlet = portlet;
+        }
+
+        @Override
+        public void criticalNotification(WrappedRequest request,
+                WrappedResponse response, String cap, String msg,
+                String details, String outOfSyncURL) throws IOException {
+            portlet.criticalNotification(WrappedPortletRequest.cast(request),
+                    (WrappedPortletResponse) response, cap, msg, details,
+                    outOfSyncURL);
+        }
+    }
+
+    /**
+     * This portlet parameter is used to add styles to the main element. E.g
+     * "height:500px" generates a style="height:500px" to the main element.
+     */
+    public static final String PORTLET_PARAMETER_STYLE = "style";
+
+    /**
+     * This portal parameter is used to define the name of the Vaadin theme that
+     * is used for all Vaadin applications in the portal.
+     */
+    public static final String PORTAL_PARAMETER_VAADIN_THEME = "vaadin.theme";
+
+    public static final String WRITE_AJAX_PAGE_SCRIPT_WIDGETSET_SHOULD_WRITE = "writeAjaxPageScriptWidgetsetShouldWrite";
+
+    // TODO some parts could be shared with AbstractApplicationServlet
+
+    // TODO Can we close the application when the portlet is removed? Do we know
+    // when the portlet is removed?
+
+    private DeploymentConfiguration deploymentConfiguration;
+    private AddonContext addonContext;
+
+    @Override
+    public void init(PortletConfig config) throws PortletException {
+        super.init(config);
+        Properties applicationProperties = new Properties();
+
+        // Read default parameters from the context
+        final PortletContext context = config.getPortletContext();
+        for (final Enumeration<String> e = context.getInitParameterNames(); e
+                .hasMoreElements();) {
+            final String name = e.nextElement();
+            applicationProperties.setProperty(name,
+                    context.getInitParameter(name));
+        }
+
+        // Override with application settings from portlet.xml
+        for (final Enumeration<String> e = config.getInitParameterNames(); e
+                .hasMoreElements();) {
+            final String name = e.nextElement();
+            applicationProperties.setProperty(name,
+                    config.getInitParameter(name));
+        }
+
+        deploymentConfiguration = new AbstractDeploymentConfiguration(
+                getClass(), applicationProperties) {
+            @Override
+            public String getConfiguredWidgetset(WrappedRequest request) {
+
+                String widgetset = getApplicationOrSystemProperty(
+                        PARAMETER_WIDGETSET, null);
+
+                if (widgetset == null) {
+                    // If no widgetset defined for the application, check the
+                    // portal property
+                    widgetset = WrappedPortletRequest.cast(request)
+                            .getPortalProperty(
+                                    PORTAL_PARAMETER_VAADIN_WIDGETSET);
+                }
+
+                if (widgetset == null) {
+                    // If no widgetset defined for the portal, use the default
+                    widgetset = DEFAULT_WIDGETSET;
+                }
+
+                return widgetset;
+            }
+
+            @Override
+            public String getConfiguredTheme(WrappedRequest request) {
+
+                // is the default theme defined by the portal?
+                String themeName = WrappedPortletRequest.cast(request)
+                        .getPortalProperty(
+                                Constants.PORTAL_PARAMETER_VAADIN_THEME);
+
+                if (themeName == null) {
+                    // no, using the default theme defined by Vaadin
+                    themeName = DEFAULT_THEME_NAME;
+                }
+
+                return themeName;
+            }
+
+            @Override
+            public boolean isStandalone(WrappedRequest request) {
+                return false;
+            }
+
+            /*
+             * (non-Javadoc)
+             * 
+             * @see
+             * com.vaadin.terminal.DeploymentConfiguration#getStaticFileLocation
+             * (com.vaadin.terminal.WrappedRequest)
+             * 
+             * Return the URL from where static files, e.g. the widgetset and
+             * the theme, are served. In a standard configuration the VAADIN
+             * folder inside the returned folder is what is used for widgetsets
+             * and themes.
+             * 
+             * @return The location of static resources (inside which there
+             * should be a VAADIN directory). Does not end with a slash (/).
+             */
+
+            @Override
+            public String getStaticFileLocation(WrappedRequest request) {
+                String staticFileLocation = WrappedPortletRequest
+                        .cast(request)
+                        .getPortalProperty(
+                                Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH);
+                if (staticFileLocation != null) {
+                    // remove trailing slash if any
+                    while (staticFileLocation.endsWith(".")) {
+                        staticFileLocation = staticFileLocation.substring(0,
+                                staticFileLocation.length() - 1);
+                    }
+                    return staticFileLocation;
+                } else {
+                    // default for Liferay
+                    return "/html";
+                }
+            }
+
+            @Override
+            public String getMimeType(String resourceName) {
+                return getPortletContext().getMimeType(resourceName);
+            }
+
+            @Override
+            public SystemMessages getSystemMessages() {
+                return VaadinPortlet.this.getSystemMessages();
+            }
+        };
+
+        addonContext = new AddonContext(deploymentConfiguration);
+        addonContext.init();
+    }
+
+    @Override
+    public void destroy() {
+        super.destroy();
+
+        addonContext.destroy();
+    }
+
+    protected enum RequestType {
+        FILE_UPLOAD, UIDL, RENDER, STATIC_FILE, APPLICATION_RESOURCE, DUMMY, EVENT, ACTION, UNKNOWN, BROWSER_DETAILS, CONNECTOR_RESOURCE, HEARTBEAT;
+    }
+
+    protected RequestType getRequestType(WrappedPortletRequest wrappedRequest) {
+        PortletRequest request = wrappedRequest.getPortletRequest();
+        if (request instanceof RenderRequest) {
+            return RequestType.RENDER;
+        } else if (request instanceof ResourceRequest) {
+            ResourceRequest resourceRequest = (ResourceRequest) request;
+            if (ServletPortletHelper.isUIDLRequest(wrappedRequest)) {
+                return RequestType.UIDL;
+            } else if (isBrowserDetailsRequest(resourceRequest)) {
+                return RequestType.BROWSER_DETAILS;
+            } else if (ServletPortletHelper.isFileUploadRequest(wrappedRequest)) {
+                return RequestType.FILE_UPLOAD;
+            } else if (ServletPortletHelper
+                    .isConnectorResourceRequest(wrappedRequest)) {
+                return RequestType.CONNECTOR_RESOURCE;
+            } else if (ServletPortletHelper
+                    .isApplicationResourceRequest(wrappedRequest)) {
+                return RequestType.APPLICATION_RESOURCE;
+            } else if (ServletPortletHelper.isHeartbeatRequest(wrappedRequest)) {
+                return RequestType.HEARTBEAT;
+            } else if (isDummyRequest(resourceRequest)) {
+                return RequestType.DUMMY;
+            } else {
+                return RequestType.STATIC_FILE;
+            }
+        } else if (request instanceof ActionRequest) {
+            return RequestType.ACTION;
+        } else if (request instanceof EventRequest) {
+            return RequestType.EVENT;
+        }
+        return RequestType.UNKNOWN;
+    }
+
+    private boolean isBrowserDetailsRequest(ResourceRequest request) {
+        return request.getResourceID() != null
+                && request.getResourceID().equals("browserDetails");
+    }
+
+    private boolean isDummyRequest(ResourceRequest request) {
+        return request.getResourceID() != null
+                && request.getResourceID().equals("DUMMY");
+    }
+
+    /**
+     * Returns true if the portlet is running in production mode. Production
+     * mode disables all debug facilities.
+     * 
+     * @return true if in production mode, false if in debug mode
+     */
+    public boolean isProductionMode() {
+        return deploymentConfiguration.isProductionMode();
+    }
+
+    protected void handleRequest(PortletRequest request,
+            PortletResponse response) throws PortletException, IOException {
+        RequestTimer requestTimer = new RequestTimer();
+        requestTimer.start();
+
+        AbstractApplicationPortletWrapper portletWrapper = new AbstractApplicationPortletWrapper(
+                this);
+
+        WrappedPortletRequest wrappedRequest = createWrappedRequest(request);
+
+        WrappedPortletResponse wrappedResponse = new WrappedPortletResponse(
+                response, getDeploymentConfiguration());
+
+        RequestType requestType = getRequestType(wrappedRequest);
+
+        if (requestType == RequestType.UNKNOWN) {
+            handleUnknownRequest(request, response);
+        } else if (requestType == RequestType.DUMMY) {
+            /*
+             * This dummy page is used by action responses to redirect to, in
+             * order to prevent the boot strap code from being rendered into
+             * strange places such as iframes.
+             */
+            ((ResourceResponse) response).setContentType("text/html");
+            final OutputStream out = ((ResourceResponse) response)
+                    .getPortletOutputStream();
+            final PrintWriter outWriter = new PrintWriter(new BufferedWriter(
+                    new OutputStreamWriter(out, "UTF-8")));
+            outWriter.print("<html><body>dummy page</body></html>");
+            outWriter.close();
+        } else if (requestType == RequestType.STATIC_FILE) {
+            serveStaticResources((ResourceRequest) request,
+                    (ResourceResponse) response);
+        } else {
+            Application application = null;
+            boolean transactionStarted = false;
+            boolean requestStarted = false;
+            boolean applicationRunning = false;
+
+            try {
+                // TODO What about PARAM_UNLOADBURST & redirectToApplication??
+
+                /* Find out which application this request is related to */
+                application = findApplicationInstance(wrappedRequest,
+                        requestType);
+                if (application == null) {
+                    return;
+                }
+                Application.setCurrent(application);
+
+                /*
+                 * Get or create an application context and an application
+                 * manager for the session
+                 */
+                PortletApplicationContext2 applicationContext = getApplicationContext(request
+                        .getPortletSession());
+                applicationContext.setResponse(response);
+                applicationContext.setPortletConfig(getPortletConfig());
+
+                PortletCommunicationManager applicationManager = applicationContext
+                        .getApplicationManager(application);
+
+                if (requestType == RequestType.CONNECTOR_RESOURCE) {
+                    applicationManager.serveConnectorResource(wrappedRequest,
+                            wrappedResponse);
+                    return;
+                } else if (requestType == RequestType.HEARTBEAT) {
+                    applicationManager.handleHeartbeatRequest(wrappedRequest,
+                            wrappedResponse, application);
+                    return;
+                }
+
+                /* Update browser information from request */
+                applicationContext.getBrowser().updateRequestDetails(
+                        wrappedRequest);
+
+                /*
+                 * Call application requestStart before Application.init() is
+                 * called (bypasses the limitation in TransactionListener)
+                 */
+                if (application instanceof PortletRequestListener) {
+                    ((PortletRequestListener) application).onRequestStart(
+                            request, response);
+                    requestStarted = true;
+                }
+
+                /* Start the newly created application */
+                startApplication(request, application, applicationContext);
+                applicationRunning = true;
+
+                /*
+                 * Transaction starts. Call transaction listeners. Transaction
+                 * end is called in the finally block below.
+                 */
+                applicationContext.startTransaction(application, request);
+                transactionStarted = true;
+
+                /* Notify listeners */
+
+                // Finds the window within the application
+                UI uI = null;
+                synchronized (application) {
+                    if (application.isRunning()) {
+                        switch (requestType) {
+                        case RENDER:
+                        case ACTION:
+                            // Both action requests and render requests are ok
+                            // without a UI as they render the initial HTML
+                            // and then do a second request
+                            uI = application.getUIForRequest(wrappedRequest);
+                            break;
+                        case BROWSER_DETAILS:
+                            // Should not try to find a UI here as the
+                            // combined request details might change the UI
+                            break;
+                        case FILE_UPLOAD:
+                            // no window
+                            break;
+                        case APPLICATION_RESOURCE:
+                            // use main window - should not need any window
+                            // UI = application.getUI();
+                            break;
+                        default:
+                            uI = application.getUIForRequest(wrappedRequest);
+                        }
+                        // if window not found, not a problem - use null
+                    }
+                }
+
+                // TODO Should this happen before or after the transaction
+                // starts?
+                if (request instanceof RenderRequest) {
+                    applicationContext.firePortletRenderRequest(application,
+                            uI, (RenderRequest) request,
+                            (RenderResponse) response);
+                } else if (request instanceof ActionRequest) {
+                    applicationContext.firePortletActionRequest(application,
+                            uI, (ActionRequest) request,
+                            (ActionResponse) response);
+                } else if (request instanceof EventRequest) {
+                    applicationContext.firePortletEventRequest(application, uI,
+                            (EventRequest) request, (EventResponse) response);
+                } else if (request instanceof ResourceRequest) {
+                    applicationContext.firePortletResourceRequest(application,
+                            uI, (ResourceRequest) request,
+                            (ResourceResponse) response);
+                }
+
+                /* Handle the request */
+                if (requestType == RequestType.FILE_UPLOAD) {
+                    // UI is resolved in handleFileUpload by
+                    // PortletCommunicationManager
+                    applicationManager.handleFileUpload(application,
+                            wrappedRequest, wrappedResponse);
+                    return;
+                } else if (requestType == RequestType.BROWSER_DETAILS) {
+                    applicationManager.handleBrowserDetailsRequest(
+                            wrappedRequest, wrappedResponse, application);
+                    return;
+                } else if (requestType == RequestType.UIDL) {
+                    // Handles AJAX UIDL requests
+                    applicationManager.handleUidlRequest(wrappedRequest,
+                            wrappedResponse, portletWrapper, uI);
+                    return;
+                } else {
+                    /*
+                     * Removes the application if it has stopped
+                     */
+                    if (!application.isRunning()) {
+                        endApplication(request, response, application);
+                        return;
+                    }
+
+                    handleOtherRequest(wrappedRequest, wrappedResponse,
+                            requestType, application, applicationContext,
+                            applicationManager);
+                }
+            } catch (final SessionExpiredException e) {
+                // TODO Figure out a better way to deal with
+                // SessionExpiredExceptions
+                getLogger().finest("A user session has expired");
+            } catch (final GeneralSecurityException e) {
+                // TODO Figure out a better way to deal with
+                // GeneralSecurityExceptions
+                getLogger()
+                        .fine("General security exception, the security key was probably incorrect.");
+            } catch (final Throwable e) {
+                handleServiceException(wrappedRequest, wrappedResponse,
+                        application, e);
+            } finally {
+
+                if (applicationRunning) {
+                    application.closeInactiveUIs();
+                }
+
+                // Notifies transaction end
+                try {
+                    if (transactionStarted) {
+                        ((PortletApplicationContext2) application.getContext())
+                                .endTransaction(application, request);
+                    }
+                } finally {
+                    try {
+                        if (requestStarted) {
+                            ((PortletRequestListener) application)
+                                    .onRequestEnd(request, response);
+
+                        }
+                    } finally {
+                        UI.setCurrent(null);
+                        Application.setCurrent(null);
+
+                        PortletSession session = request
+                                .getPortletSession(false);
+                        if (session != null) {
+                            requestTimer.stop(getApplicationContext(session));
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Wraps the request in a (possibly portal specific) wrapped portlet
+     * request.
+     * 
+     * @param request
+     *            The original PortletRequest
+     * @return A wrapped version of the PorletRequest
+     */
+    protected WrappedPortletRequest createWrappedRequest(PortletRequest request) {
+        String portalInfo = request.getPortalContext().getPortalInfo()
+                .toLowerCase();
+        if (portalInfo.contains("liferay")) {
+            return new WrappedLiferayRequest(request,
+                    getDeploymentConfiguration());
+        } else if (portalInfo.contains("gatein")) {
+            return new WrappedGateinRequest(request,
+                    getDeploymentConfiguration());
+        } else {
+            return new WrappedPortletRequest(request,
+                    getDeploymentConfiguration());
+        }
+
+    }
+
+    protected DeploymentConfiguration getDeploymentConfiguration() {
+        return deploymentConfiguration;
+    }
+
+    private void handleUnknownRequest(PortletRequest request,
+            PortletResponse response) {
+        getLogger().warning("Unknown request type");
+    }
+
+    /**
+     * Handle a portlet request that is not for static files, UIDL or upload.
+     * Also render requests are handled here.
+     * 
+     * This method is called after starting the application and calling portlet
+     * and transaction listeners.
+     * 
+     * @param request
+     * @param response
+     * @param requestType
+     * @param application
+     * @param applicationContext
+     * @param applicationManager
+     * @throws PortletException
+     * @throws IOException
+     * @throws MalformedURLException
+     */
+    private void handleOtherRequest(WrappedPortletRequest request,
+            WrappedResponse response, RequestType requestType,
+            Application application,
+            PortletApplicationContext2 applicationContext,
+            PortletCommunicationManager applicationManager)
+            throws PortletException, IOException, MalformedURLException {
+        if (requestType == RequestType.APPLICATION_RESOURCE
+                || requestType == RequestType.RENDER) {
+            if (!applicationManager.handleApplicationRequest(request, response)) {
+                response.sendError(HttpServletResponse.SC_NOT_FOUND,
+                        "Not found");
+            }
+        } else if (requestType == RequestType.EVENT) {
+            // nothing to do, listeners do all the work
+        } else if (requestType == RequestType.ACTION) {
+            // nothing to do, listeners do all the work
+        } else {
+            throw new IllegalStateException(
+                    "handleRequest() without anything to do - should never happen!");
+        }
+    }
+
+    @Override
+    public void processEvent(EventRequest request, EventResponse response)
+            throws PortletException, IOException {
+        handleRequest(request, response);
+    }
+
+    private void serveStaticResources(ResourceRequest request,
+            ResourceResponse response) throws IOException, PortletException {
+        final String resourceID = request.getResourceID();
+        final PortletContext pc = getPortletContext();
+
+        InputStream is = pc.getResourceAsStream(resourceID);
+        if (is != null) {
+            final String mimetype = pc.getMimeType(resourceID);
+            if (mimetype != null) {
+                response.setContentType(mimetype);
+            }
+            final OutputStream os = response.getPortletOutputStream();
+            final byte buffer[] = new byte[DEFAULT_BUFFER_SIZE];
+            int bytes;
+            while ((bytes = is.read(buffer)) >= 0) {
+                os.write(buffer, 0, bytes);
+            }
+        } else {
+            getLogger().info(
+                    "Requested resource [" + resourceID
+                            + "] could not be found");
+            response.setProperty(ResourceResponse.HTTP_STATUS_CODE,
+                    Integer.toString(HttpServletResponse.SC_NOT_FOUND));
+        }
+    }
+
+    @Override
+    public void processAction(ActionRequest request, ActionResponse response)
+            throws PortletException, IOException {
+        handleRequest(request, response);
+    }
+
+    @Override
+    protected void doDispatch(RenderRequest request, RenderResponse response)
+            throws PortletException, IOException {
+        try {
+            // try to let super handle - it'll call methods annotated for
+            // handling, the default doXYZ(), or throw if a handler for the mode
+            // is not found
+            super.doDispatch(request, response);
+
+        } catch (PortletException e) {
+            if (e.getCause() == null) {
+                // No cause interpreted as 'unknown mode' - pass that trough
+                // so that the application can handle
+                handleRequest(request, response);
+
+            } else {
+                // Something else failed, pass on
+                throw e;
+            }
+        }
+    }
+
+    @Override
+    public void serveResource(ResourceRequest request, ResourceResponse response)
+            throws PortletException, IOException {
+        handleRequest(request, response);
+    }
+
+    boolean requestCanCreateApplication(PortletRequest request,
+            RequestType requestType) {
+        if (requestType == RequestType.UIDL && isRepaintAll(request)) {
+            return true;
+        } else if (requestType == RequestType.RENDER) {
+            // In most cases the first request is a render request that renders
+            // the HTML fragment. This should create an application instance.
+            return true;
+        } else if (requestType == RequestType.EVENT) {
+            // A portlet can also be sent an event even though it has not been
+            // rendered, e.g. portlet on one page sends an event to a portlet on
+            // another page and then moves the user to that page.
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isRepaintAll(PortletRequest request) {
+        return (request.getParameter(URL_PARAMETER_REPAINT_ALL) != null)
+                && (request.getParameter(URL_PARAMETER_REPAINT_ALL).equals("1"));
+    }
+
+    private void startApplication(PortletRequest request,
+            Application application, PortletApplicationContext2 context)
+            throws PortletException, MalformedURLException {
+        if (!application.isRunning()) {
+            Locale locale = request.getLocale();
+            application.setLocale(locale);
+            // No application URL when running inside a portlet
+            application.start(new ApplicationStartEvent(null,
+                    getDeploymentConfiguration(), context));
+            addonContext.fireApplicationStarted(application);
+        }
+    }
+
+    private void endApplication(PortletRequest request,
+            PortletResponse response, Application application)
+            throws IOException {
+        final PortletSession session = request.getPortletSession();
+        if (session != null) {
+            getApplicationContext(session).removeApplication(application);
+        }
+        // Do not send any redirects when running inside a portlet.
+    }
+
+    private Application findApplicationInstance(
+            WrappedPortletRequest wrappedRequest, RequestType requestType)
+            throws PortletException, SessionExpiredException,
+            MalformedURLException {
+        PortletRequest request = wrappedRequest.getPortletRequest();
+
+        boolean requestCanCreateApplication = requestCanCreateApplication(
+                request, requestType);
+
+        /* Find an existing application for this request. */
+        Application application = getExistingApplication(request,
+                requestCanCreateApplication);
+
+        if (application != null) {
+            /*
+             * There is an existing application. We can use this as long as the
+             * user not specifically requested to close or restart it.
+             */
+
+            final boolean restartApplication = (wrappedRequest
+                    .getParameter(URL_PARAMETER_RESTART_APPLICATION) != null);
+            final boolean closeApplication = (wrappedRequest
+                    .getParameter(URL_PARAMETER_CLOSE_APPLICATION) != null);
+
+            if (restartApplication) {
+                closeApplication(application, request.getPortletSession(false));
+                return createApplication(request);
+            } else if (closeApplication) {
+                closeApplication(application, request.getPortletSession(false));
+                return null;
+            } else {
+                return application;
+            }
+        }
+
+        // No existing application was found
+
+        if (requestCanCreateApplication) {
+            return createApplication(request);
+        } else {
+            throw new SessionExpiredException();
+        }
+    }
+
+    private void closeApplication(Application application,
+            PortletSession session) {
+        if (application == null) {
+            return;
+        }
+
+        application.close();
+        if (session != null) {
+            PortletApplicationContext2 context = getApplicationContext(session);
+            context.removeApplication(application);
+        }
+    }
+
+    private Application createApplication(PortletRequest request)
+            throws PortletException, MalformedURLException {
+        Application newApplication = getNewApplication(request);
+        final PortletApplicationContext2 context = getApplicationContext(request
+                .getPortletSession());
+        context.addApplication(newApplication, request.getWindowID());
+        return newApplication;
+    }
+
+    private Application getExistingApplication(PortletRequest request,
+            boolean allowSessionCreation) throws MalformedURLException,
+            SessionExpiredException {
+
+        final PortletSession session = request
+                .getPortletSession(allowSessionCreation);
+
+        if (session == null) {
+            throw new SessionExpiredException();
+        }
+
+        PortletApplicationContext2 context = getApplicationContext(session);
+        Application application = context.getApplicationForWindowId(request
+                .getWindowID());
+        if (application == null) {
+            return null;
+        }
+        if (application.isRunning()) {
+            return application;
+        }
+        // application found but not running
+        context.removeApplication(application);
+
+        return null;
+    }
+
+    protected Class<? extends Application> getApplicationClass()
+            throws ApplicationClassException {
+        return ServletPortletHelper
+                .getApplicationClass(getDeploymentConfiguration());
+    }
+
+    protected Application getNewApplication(PortletRequest request)
+            throws PortletException {
+        try {
+            final Application application = getApplicationClass().newInstance();
+            return application;
+        } catch (final IllegalAccessException e) {
+            throw new PortletException("getNewApplication failed", e);
+        } catch (final InstantiationException e) {
+            throw new PortletException("getNewApplication failed", e);
+        } catch (final ApplicationClassException e) {
+            throw new PortletException("getNewApplication failed", e);
+        }
+    }
+
+    /**
+     * Get system messages from the current application class
+     * 
+     * @return
+     */
+    protected SystemMessages getSystemMessages() {
+        return ServletPortletHelper.DEFAULT_SYSTEM_MESSAGES;
+    }
+
+    private void handleServiceException(WrappedPortletRequest request,
+            WrappedPortletResponse response, Application application,
+            Throwable e) throws IOException, PortletException {
+        // TODO Check that this error handler is working when running inside a
+        // portlet
+
+        // if this was an UIDL request, response UIDL back to client
+        if (getRequestType(request) == RequestType.UIDL) {
+            SystemMessages ci = getSystemMessages();
+            criticalNotification(request, response,
+                    ci.getInternalErrorCaption(), ci.getInternalErrorMessage(),
+                    null, ci.getInternalErrorURL());
+            if (application != null) {
+                application.getErrorHandler()
+                        .terminalError(new RequestError(e));
+            } else {
+                throw new PortletException(e);
+            }
+        } else {
+            // Re-throw other exceptions
+            throw new PortletException(e);
+        }
+
+    }
+
+    @SuppressWarnings("serial")
+    public class RequestError implements Terminal.ErrorEvent, Serializable {
+
+        private final Throwable throwable;
+
+        public RequestError(Throwable throwable) {
+            this.throwable = throwable;
+        }
+
+        @Override
+        public Throwable getThrowable() {
+            return throwable;
+        }
+
+    }
+
+    /**
+     * Send notification to client's application. Used to notify client of
+     * critical errors and session expiration due to long inactivity. Server has
+     * no knowledge of what application client refers to.
+     * 
+     * @param request
+     *            the Portlet request instance.
+     * @param response
+     *            the Portlet response to write to.
+     * @param caption
+     *            for the notification
+     * @param message
+     *            for the notification
+     * @param details
+     *            a detail message to show in addition to the passed message.
+     *            Currently shown directly but could be hidden behind a details
+     *            drop down.
+     * @param url
+     *            url to load after message, null for current page
+     * @throws IOException
+     *             if the writing failed due to input/output error.
+     */
+    void criticalNotification(WrappedPortletRequest request,
+            WrappedPortletResponse response, String caption, String message,
+            String details, String url) throws IOException {
+
+        // clients JS app is still running, but server application either
+        // no longer exists or it might fail to perform reasonably.
+        // send a notification to client's application and link how
+        // to "restart" application.
+
+        if (caption != null) {
+            caption = "\"" + caption + "\"";
+        }
+        if (details != null) {
+            if (message == null) {
+                message = details;
+            } else {
+                message += "<br/><br/>" + details;
+            }
+        }
+        if (message != null) {
+            message = "\"" + message + "\"";
+        }
+        if (url != null) {
+            url = "\"" + url + "\"";
+        }
+
+        // Set the response type
+        response.setContentType("application/json; charset=UTF-8");
+        final OutputStream out = response.getOutputStream();
+        final PrintWriter outWriter = new PrintWriter(new BufferedWriter(
+                new OutputStreamWriter(out, "UTF-8")));
+        outWriter.print("for(;;);[{\"changes\":[], \"meta\" : {"
+                + "\"appError\": {" + "\"caption\":" + caption + ","
+                + "\"message\" : " + message + "," + "\"url\" : " + url
+                + "}}, \"resources\": {}, \"locales\":[]}]");
+        outWriter.close();
+    }
+
+    /**
+     * 
+     * Gets the application context for a PortletSession. If no context is
+     * currently stored in a session a new context is created and stored in the
+     * session.
+     * 
+     * @param portletSession
+     *            the portlet session.
+     * @return the application context for the session.
+     */
+    protected PortletApplicationContext2 getApplicationContext(
+            PortletSession portletSession) {
+        return PortletApplicationContext2.getApplicationContext(portletSession);
+    }
+
+    private static final Logger getLogger() {
+        return Logger.getLogger(VaadinPortlet.class.getName());
+    }
+
+}
diff --git a/server/src/com/vaadin/server/WrappedPortletRequest.java b/server/src/com/vaadin/server/WrappedPortletRequest.java
index 40a5c5f509..47a8e2c358 100644
--- a/server/src/com/vaadin/server/WrappedPortletRequest.java
+++ b/server/src/com/vaadin/server/WrappedPortletRequest.java
@@ -101,7 +101,7 @@ public class WrappedPortletRequest implements WrappedRequest {
         if (request instanceof ResourceRequest) {
             ResourceRequest resourceRequest = (ResourceRequest) request;
             String resourceID = resourceRequest.getResourceID();
-            if (AbstractApplicationPortlet.RESOURCE_URL_ID.equals(resourceID)) {
+            if (VaadinPortlet.RESOURCE_URL_ID.equals(resourceID)) {
                 String resourcePath = resourceRequest
                         .getParameter(ApplicationConstants.V_RESOURCE_PATH);
                 return resourcePath;
diff --git a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
index e98be99cbc..0d3dea28ac 100644
--- a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
+++ b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
@@ -40,8 +40,7 @@ public class TestClassesSerializable extends TestCase {
             "com\\.vaadin\\.event\\.FieldEvents", //
             "com\\.vaadin\\.event\\.LayoutEvents", //
             "com\\.vaadin\\.event\\.MouseEvents", //
-            "com\\.vaadin\\.server\\.AbstractApplicationPortlet", //
-            "com\\.vaadin\\.server\\.ApplicationPortlet2", //
+            "com\\.vaadin\\.server\\.VaadinPortlet", //
             "com\\.vaadin\\.server\\.Constants", //
             "com\\.vaadin\\.util\\.SerializerHelper", // fully static
             // class level filtering, also affecting nested classes and
-- 
cgit v1.2.3