MERGED AJAX ADAPTER TO WEB ADAPTER

- Merged all functionality of AJAX adapter inside the web adapter (MAJOR step for making the product more understandable)
- Removed "Adapter" alltogether from API level (MAJOR step for making the product more understandable)
- Built groundwork for automatic terminal detection based selection of technologies
- Built groundwork for integration of theme packaging mechanism by allowing Ajax apps to use theme resourses!
- Deployment is now easier - it is enough to deploy only one instance of the application
- Now AJAX apps also use WebApplicationContext (and get all the features from them!) (should fix bug #93)
- Now AJAX apps also can use WebBrowser class that implements Terminal (fixes bug #74)
- Now AJAX and Web-apps use the same session -> you can jump from web to ajax and preserve state! (fixes bug #60)
- Built groundwork for easier integration of license control (making solving #89 easier) 


svn changeset:130/svn branch:toolkit

1 files changed, 0 insertions, 604 deletions

diff --git a/src/com/itmill/toolkit/terminal/ajax/ApplicationManager.java b/src/com/itmill/toolkit/terminal/ajax/ApplicationManager.java
deleted file mode 100644
index 403d6721eb..0000000000
--- a/src/com/itmill/toolkit/terminal/ajax/ApplicationManager.java
+++ /dev/null
@@ -1,604 +0,0 @@
-/* *************************************************************************
- 
-                               IT Mill Toolkit 
-
-               Development of Browser User Intarfaces Made Easy
-
-                    Copyright (C) 2000-2006 IT Mill Ltd
-                     
-   *************************************************************************
-
-   This product is distributed under commercial license that can be found
-   from the product package on license/license.txt. Use of this product might 
-   require purchasing a commercial license from IT Mill Ltd. For guidelines 
-   on usage, see license/licensing-guidelines.html
-
-   *************************************************************************
-   
-   For more information, contact:
-   
-   IT Mill Ltd                           phone: +358 2 4802 7180
-   Ruukinkatu 2-4                        fax:   +358 2 4802 7181
-   20540, Turku                          email:  info@itmill.com
-   Finland                               company www: www.itmill.com
-   
-   Primary source for information and releases: www.itmill.com
-
-   ********************************************************************** */
-
-package com.itmill.toolkit.terminal.ajax;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.Application.WindowAttachEvent;
-import com.itmill.toolkit.Application.WindowDetachEvent;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.Paintable;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.FrameWindow;
-import com.itmill.toolkit.ui.Window;
-
-/** Application manager processes changes and paints for single
- *  application instance.
- * 
- * @author IT Mill Ltd, Joonas Lehtinen, Sami Ekblad
- * @version @VERSION@
- * @since 3.1
- */
-public class ApplicationManager implements Paintable.RepaintRequestListener,
-        Application.WindowAttachListener, Application.WindowDetachListener {
-
-    private static String GET_PARAM_VARIABLE_CHANGES = "changeVariables";
-
-    private static String GET_PARAM_REPAINT_ALL = "repaintAll";
-
-    private static String GET_PARAM_UI_CHANGES_FORMAT = "format";
-
-    private static int DEFAULT_BUFFER_SIZE = 32 * 1024;
-
-    private static int MAX_BUFFER_SIZE = 64 * 1024;
-
-    private WeakHashMap applicationToVariableMapMap = new WeakHashMap();
-
-    private HashSet dirtyPaintabletSet = new HashSet();
-
-    private WeakHashMap paintableIdMap = new WeakHashMap();
-
-    private int idSequence = 0;
-
-    private Application application;
-
-    private Set removedWindows = new HashSet();
-
-    private UIDLPaintTarget paintTarget;
-
-    public ApplicationManager(Application application) {
-        this.application = application;
-    }
-
-    private VariableMap getVariableMap() {
-        VariableMap vm = (VariableMap) applicationToVariableMapMap
-                .get(application);
-        if (vm == null) {
-            vm = new VariableMap();
-            applicationToVariableMapMap.put(application, vm);
-        }
-        return vm;
-    }
-
-    public void takeControl() {
-        application.addListener((Application.WindowAttachListener) this);
-        application.addListener((Application.WindowDetachListener) this);
-
-    }
-
-    public void releaseControl() {
-        application.removeListener((Application.WindowAttachListener) this);
-        application.removeListener((Application.WindowDetachListener) this);
-    }
-
-    public void handleXmlHttpRequest(HttpServletRequest request,
-            HttpServletResponse response) throws IOException {
-
-        boolean repaintAll = request.getParameter(GET_PARAM_REPAINT_ALL) != null;
-
-        OutputStream out = response.getOutputStream();
-        try {
-
-            // Is this a download request from application
-            DownloadStream download = null;
-
-            // The rest of the process is synchronized with the application
-            // in order to guarantee that no parallel variable handling is
-            // made
-            synchronized (application) {
-
-                // Change all variables based on request parameters
-                Map unhandledParameters = getVariableMap().handleVariables(
-                        request, application);
-
-                // Handle the URI if the application is still running
-                if (application.isRunning())
-                    download = handleURI(application, request, response);
-
-                // If this is not a download request
-                if (download == null) {
-                    
-                    // Find the window within the application
-                    Window window = null;
-                    if (application.isRunning())
-                        window = getApplicationWindow(request, application);
-
-                    // Handle the unhandled parameters if the application is
-                    // still running
-                    if (window != null && unhandledParameters != null
-                            && !unhandledParameters.isEmpty())
-                        window.handleParameters(unhandledParameters);
-
-                    // Remove application if it has stopped
-                    if (!application.isRunning()) {
-                        endApplication(request, response, application);
-                        return;
-                    }
-
-                    // Return if no window found
-                    if (window == null)
-                        return;
-
-                    // Set the response type
-                    response.setContentType("application/xml; charset=UTF-8");
-
-                    paintTarget = new UIDLPaintTarget(
-                                                getVariableMap(), this, out);
-                    
-                    // Render the removed windows
-                    Set removed = new HashSet(getRemovedWindows());
-                    if (removed.size() > 0) {
-                        for (Iterator i = removed.iterator(); i.hasNext();) {
-                            Window w = (Window) i.next();
-                            paintTarget.startTag("change");
-                            paintTarget.addAttribute("format", "uidl");
-                            String pid = getPaintableId(w);
-                            paintTarget.addAttribute("pid", pid);
-                            paintTarget.addAttribute("windowname", w
-                                    .getName());
-                            paintTarget.addAttribute("visible", false);
-                            paintTarget.endTag("change");
-                            removedWindowNotified(w);
-
-                        }
-                    }
-
-                    // Paint components
-                    Set paintables;
-                    if (repaintAll) {
-                        paintables = new LinkedHashSet();
-                        paintables.add(window);
-                    } else
-                        paintables = getDirtyComponents();
-                    if (paintables != null) {
-
-                        // Create "working copy" of the current state.
-                        List currentPaintables = new ArrayList(paintables);
-
-                        // Sort the paintable so that parent windows
-                        // are always painted before child windows
-                        Collections.sort(currentPaintables, new Comparator() {
-
-                            public int compare(Object o1, Object o2) {
-
-                                // If first argumement is now window
-                                // the second is "smaller" if it is.
-                                if (!(o1 instanceof Window)) {
-                                    return (o2 instanceof Window) ? 1 : 0;
-                                }
-
-                                // Now, if second is not window the
-                                // first is smaller.
-                                if (!(o2 instanceof Window)) {
-                                    return -1;
-                                }
-
-                                // Both are windows.
-                                String n1 = ((Window) o1).getName();
-                                String n2 = ((Window) o2).getName();
-                                if (o1 instanceof FrameWindow) {
-                                    if (((FrameWindow) o1).getFrameset()
-                                            .getFrame(n2) != null) {
-                                        return -1;
-                                    } else if (!(o2 instanceof FrameWindow)) {
-                                        return -1;
-                                    }
-                                }
-                                if (o2 instanceof FrameWindow) {
-                                    if (((FrameWindow) o2).getFrameset()
-                                            .getFrame(n1) != null) {
-                                        return 1;
-                                    } else if (!(o1 instanceof FrameWindow)) {
-                                        return 1;
-                                    }
-                                }
-
-                                return 0;
-                            }
-                        });
-
-                        for (Iterator i = currentPaintables.iterator(); i
-                                .hasNext();) {
-                            Paintable p = (Paintable) i.next();
-                            paintTarget.startTag("change");
-                            paintTarget.addAttribute("format", "uidl");
-                            String pid = getPaintableId(p);
-                            paintTarget.addAttribute("pid", pid);
-                            
-                            // Track paints to identify empty paints
-                            paintTarget.setTrackPaints(true);
-                            p.paint(paintTarget);
-
-                            // If no paints add attribute empty
-                            if (paintTarget.getNumberOfPaints() <= 0) {
-                                paintTarget.addAttribute("visible", false);
-                            }
-                            paintTarget.endTag("change");
-                            paintablePainted(p);
-                        }
-                    }
-                    
-
-                    paintTarget.close();
-                    out.flush();
-                } else {
-
-                    // For download request, transfer the downloaded data
-                    handleDownload(download, request, response);
-                }
-            }
-
-            out.flush();
-            out.close();
-
-        } catch (Throwable e) {
-            // Write the error report to client
-            OutputStreamWriter w = new OutputStreamWriter(out);
-            PrintWriter err = new PrintWriter(w);
-            err
-                    .write("<html><head><title>Application Internal Error</title></head><body>");
-            err.write("<h1>" + e.toString() + "</h1><pre>\n");
-            e.printStackTrace(new PrintWriter(err));
-            err.write("\n</pre></body></html>");
-            err.close();
-        } finally {
-
-        }
-
-    }
-
-    /**
-     * Get the existing application or create a new one. Get a window within an
-     * application based on the requested URI.
-     * 
-     * @param request
-     *            HTTP Request.
-     * @param application
-     *            Application to query for window.
-     * @return Window mathing the given URI or null if not found.
-     */
-    private Window getApplicationWindow(HttpServletRequest request,
-            Application application) throws ServletException {
-
-        Window window = null;
-
-        // Find the window where the request is handled
-        String path = request.getPathInfo();
-
-        // Main window as the URI is empty
-        if (path == null || path.length() == 0 || path.equals("/"))
-            window = application.getMainWindow();
-
-        // Try to search by window name
-        else {
-            String windowName = null;
-            if (path.charAt(0) == '/')
-                path = path.substring(1);
-            int index = path.indexOf('/');
-            if (index < 0) {
-                windowName = path;
-                path = "";
-            } else {
-                windowName = path.substring(0, index);
-                path = path.substring(index + 1);
-            }
-            window = application.getWindow(windowName);
-
-            // By default, we use main window
-            if (window == null)
-                window = application.getMainWindow();
-        }
-
-        return window;
-    }
-
-    /**
-     * Handle the requested URI. An application can add handlers to do special
-     * processing, when a certain URI is requested. The handlers are invoked
-     * before any windows URIs are processed and if a DownloadStream is returned
-     * it is sent to the client.
-     * 
-     * @see com.itmill.toolkit.terminal.URIHandler
-     * 
-     * @param application
-     *            Application owning the URI
-     * @param request
-     *            HTTP request instance
-     * @param response
-     *            HTTP response to write to.
-     * @return boolean True if the request was handled and further processing
-     *         should be suppressed, false otherwise.
-     */
-    private DownloadStream handleURI(Application application,
-            HttpServletRequest request, HttpServletResponse response) {
-
-        String uri = request.getPathInfo();
-
-        // If no URI is available
-        if (uri == null || uri.length() == 0 || uri.equals("/"))
-            return null;
-
-        // Remove the leading /
-        while (uri.startsWith("/") && uri.length() > 0)
-            uri = uri.substring(1);
-
-        // Handle the uri
-        DownloadStream stream = null;
-        try {
-            stream = application.handleURI(application.getURL(), uri);
-        } catch (Throwable t) {
-            application.terminalError(new URIHandlerErrorImpl(application, t));
-        }
-
-        return stream;
-    }
-
-    /**
-     * Handle the requested URI. An application can add handlers to do special
-     * processing, when a certain URI is requested. The handlers are invoked
-     * before any windows URIs are processed and if a DownloadStream is returned
-     * it is sent to the client.
-     * 
-     * @see com.itmill.toolkit.terminal.URIHandler
-     * 
-     * @param application
-     *            Application owning the URI
-     * @param request
-     *            HTTP request instance
-     * @param response
-     *            HTTP response to write to.
-     * @return boolean True if the request was handled and further processing
-     *         should be suppressed, false otherwise.
-     */
-    private void handleDownload(DownloadStream stream,
-            HttpServletRequest request, HttpServletResponse response) {
-
-        // Download from given stream
-        InputStream data = stream.getStream();
-        if (data != null) {
-
-            // Set content type
-            response.setContentType(stream.getContentType());
-
-            // Set cache headers
-            long cacheTime = stream.getCacheTime();
-            if (cacheTime <= 0) {
-                response.setHeader("Cache-Control", "no-cache");
-                response.setHeader("Pragma", "no-cache");
-                response.setDateHeader("Expires", 0);
-            } else {
-                response.setHeader("Cache-Control", "max-age=" + cacheTime
-                        / 1000);
-                response.setDateHeader("Expires", System.currentTimeMillis()
-                        + cacheTime);
-                response.setHeader("Pragma", "cache"); // Required to apply
-                // caching in some
-                // Tomcats
-            }
-
-            // Copy download stream parameters directly
-            // to HTTP headers.
-            Iterator i = stream.getParameterNames();
-            if (i != null) {
-                while (i.hasNext()) {
-                    String param = (String) i.next();
-                    response.setHeader((String) param, stream
-                            .getParameter(param));
-                }
-            }
-
-            int bufferSize = stream.getBufferSize();
-            if (bufferSize <= 0 || bufferSize > MAX_BUFFER_SIZE)
-                bufferSize = DEFAULT_BUFFER_SIZE;
-            byte[] buffer = new byte[bufferSize];
-            int bytesRead = 0;
-
-            try {
-                OutputStream out = response.getOutputStream();
-
-                while ((bytesRead = data.read(buffer)) > 0) {
-                    out.write(buffer, 0, bytesRead);
-                    out.flush();
-                }
-                out.close();
-            } catch (IOException ignored) {
-            }
-
-        }
-
-    }
-
-    /** End application */
-    private void endApplication(HttpServletRequest request,
-            HttpServletResponse response, Application application)
-            throws IOException {
-
-        String logoutUrl = application.getLogoutURL();
-        if (logoutUrl == null)
-            logoutUrl = application.getURL().toString();
-
-        AjaxApplicationContext context = (AjaxApplicationContext) application
-                .getContext();
-        if (context != null)
-            context.removeApplication(application);
-
-        response.sendRedirect(response.encodeRedirectURL(logoutUrl));
-    }
-
-    /**
-     * @param window
-     * @return
-     */
-    public synchronized String getPaintableId(Paintable paintable) {
-
-        String id = (String) paintableIdMap.get(paintable);
-        if (id == null) {
-            id = "PID" + Integer.toString(idSequence++);
-            paintableIdMap.put(paintable, id);
-        }
-
-        return id;
-    }
-
-    public synchronized Set getDirtyComponents() {
-        
-        // Remove unnecessary repaints from the list
-        Object[] paintables = dirtyPaintabletSet.toArray();
-        for (int i=0; i<paintables.length; i++) {
-            if (paintables[i] instanceof Component) {
-                Component c = (Component) paintables[i];
-                
-                // Check if any of the parents of c already exist in the list
-                Component p = c.getParent();
-                while (p != null) {
-                    if (dirtyPaintabletSet.contains(p)) {
-                        
-                        // Remove component c from the dirty paintables as its parent is also dirty
-                        dirtyPaintabletSet.remove(c);
-                        p = null;
-                    } else
-                        p = p.getParent();
-                }
-            }
-        }
-        
-        return Collections.unmodifiableSet(dirtyPaintabletSet);
-    }
-
-    public synchronized void clearDirtyComponents() {
-        dirtyPaintabletSet.clear();
-    }
-
-    public void repaintRequested(RepaintRequestEvent event) {
-        Paintable p = event.getPaintable();
-        dirtyPaintabletSet.add(p);
-        
-        // For FrameWindows we mark all frames (windows) dirty
-        if (p instanceof FrameWindow) {
-            FrameWindow fw = (FrameWindow)p;
-            repaintFrameset(fw.getFrameset());
-        }
-    }
-
-    /** Recursively request repaint for all frames in frameset.
-     * 
-     * @param fs Framewindow.Frameset
-     */
-    private void repaintFrameset(FrameWindow.Frameset fs) {
-        List frames = fs.getFrames();
-        for (Iterator i = frames.iterator(); i.hasNext();) {
-            FrameWindow.Frame f = (FrameWindow.Frame) i.next();
-            if (f instanceof FrameWindow.Frameset) {
-                repaintFrameset((FrameWindow.Frameset) f);
-            } else {
-                Window w = f.getWindow();
-                if (w != null) {
-                    w.requestRepaint();
-                }
-            }
-        }               
-    }
-
-    public void paintablePainted(Paintable p) {
-        dirtyPaintabletSet.remove(p);
-        p.requestRepaintRequests();
-    }
-
-    public boolean isDirty(Paintable paintable) {
-        return (dirtyPaintabletSet.contains(paintable));
-    }
-
-    public void windowAttached(WindowAttachEvent event) {
-        event.getWindow().addListener(this);
-        dirtyPaintabletSet.add(event.getWindow());
-    }
-
-    public void windowDetached(WindowDetachEvent event) {
-        event.getWindow().removeListener(this);
-        // Notify client of the close operation
-        removedWindows.add(event.getWindow());
-    }
-
-    public synchronized Set getRemovedWindows() {
-        return Collections.unmodifiableSet(removedWindows);
-
-    }
-
-    private void removedWindowNotified(Window w) {
-        this.removedWindows.remove(w);
-    }
-
-    /** Implementation of URIHandler.ErrorEvent interface. */
-    public class URIHandlerErrorImpl implements URIHandler.ErrorEvent {
-
-        private URIHandler owner;
-
-        private Throwable throwable;
-
-        private URIHandlerErrorImpl(URIHandler owner, Throwable throwable) {
-            this.owner = owner;
-            this.throwable = throwable;
-        }
-
-        /**
-         * @see com.itmill.toolkit.terminal.Terminal.ErrorEvent#getThrowable()
-         */
-        public Throwable getThrowable() {
-            return this.throwable;
-        }
-
-        /**
-         * @see com.itmill.toolkit.terminal.URIHandler.ErrorEvent#getURIHandler()
-         */
-        public URIHandler getURIHandler() {
-            return this.owner;
-        }
-    }
-}